webidl 0.0.9 → 0.1.0

data/lib/webidl.rb

@@ -8,6 +8,7 @@ require "webidl/parse_tree/definitions"
 require "webidl/parse_tree/module"
 require "webidl/parse_tree/attribute"
 require "webidl/parse_tree/typedef"
+require "webidl/parse_tree/inheritance"
 require "webidl/parse_tree/interface"
 require "webidl/parse_tree/argument"
 require "webidl/parse_tree/argument_list"
@@ -23,7 +24,6 @@ require "webidl/parse_tree/specials"
 require "webidl/parse_tree/exception"
 require "webidl/parse_tree/exception_field"
 require "webidl/parse_tree/implements_statement"
-require "webidl/parse_tree/interface_inheritance"
 require "webidl/parse_tree/scoped_name_list"
 require "webidl/parse_tree/stringifier_attribute_or_operation"
 

data/lib/webidl/ast/exception.rb

@@ -2,12 +2,13 @@ module WebIDL
   module Ast
     class Exception < Node
       attr_reader :name
-      attr_accessor :members, :extended_attributes
+      attr_accessor :members, :extended_attributes, :inherits
 
       def initialize(parent, name)
         @parent  = parent
         @name    = name
         @members = []
+        @inherits = []
         @extended_attributes = []
       end
 

data/lib/webidl/parse_tree/exception.rb

@@ -5,6 +5,10 @@ module WebIDL
       def build(parent)
         ex = Ast::Exception.new(parent, name.text_value)
 
+        unless inherits.empty?
+          ex.inherits = inherits.build(parent)
+        end
+
         members.build(ex) unless members.empty?
 
         ex

data/lib/webidl/parse_tree/{interface_inheritance.rb → inheritance.rb}

@@ -1,11 +1,11 @@
 module WebIDL
   module ParseTree
-    class InterfaceInheritance < Treetop::Runtime::SyntaxNode
+    class Inheritance < Treetop::Runtime::SyntaxNode
 
       def build(parent)
         names.build(parent)
       end
 
-    end # InterfaceInheritance
+    end # Inheritance
   end # ParseTree
 end # WebIDL

data/lib/webidl/parser/idl.rb

@@ -349,7 +349,7 @@ module WebIDL
               r4 = _nt_ws
               s0 << r4
               if r4
-                r5 = _nt_InterfaceInheritance
+                r5 = _nt_Inheritance
                 s0 << r5
                 if r5
                   r6 = _nt_ws
@@ -418,7 +418,7 @@ module WebIDL
         r0
       end
 
-      module InterfaceInheritance0
+      module Inheritance0
         def ws
           elements[1]
         end
@@ -428,10 +428,10 @@ module WebIDL
         end
       end
 
-      def _nt_InterfaceInheritance
+      def _nt_Inheritance
         start_index = index
-        if node_cache[:InterfaceInheritance].has_key?(index)
-          cached = node_cache[:InterfaceInheritance][index]
+        if node_cache[:Inheritance].has_key?(index)
+          cached = node_cache[:Inheritance][index]
           if cached
             cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
             @index = cached.interval.end
@@ -457,8 +457,8 @@ module WebIDL
           end
         end
         if s1.last
-          r1 = instantiate_node(ParseTree::InterfaceInheritance,input, i1...index, s1)
-          r1.extend(InterfaceInheritance0)
+          r1 = instantiate_node(ParseTree::Inheritance,input, i1...index, s1)
+          r1.extend(Inheritance0)
         else
           @index = i1
           r1 = nil
@@ -469,7 +469,7 @@ module WebIDL
           r0 = instantiate_node(SyntaxNode,input, index...index)
         end
 
-        node_cache[:InterfaceInheritance][start_index] = r0
+        node_cache[:Inheritance][start_index] = r0
 
         r0
       end
@@ -595,22 +595,30 @@ module WebIDL
           elements[3]
         end
 
-        def ws3
-          elements[5]
+        def inherits
+          elements[4]
         end
 
-        def members
-          elements[6]
+        def ws3
+          elements[5]
         end
 
         def ws4
           elements[7]
         end
 
+        def members
+          elements[8]
+        end
+
         def ws5
           elements[9]
         end
 
+        def ws6
+          elements[11]
+        end
+
       end
 
       def _nt_Exception
@@ -643,44 +651,52 @@ module WebIDL
               r4 = _nt_ws
               s0 << r4
               if r4
-                if has_terminal?("{", false, index)
-                  r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                  @index += 1
-                else
-                  terminal_parse_failure("{")
-                  r5 = nil
-                end
+                r5 = _nt_Inheritance
                 s0 << r5
                 if r5
                   r6 = _nt_ws
                   s0 << r6
                   if r6
-                    r7 = _nt_ExceptionMembers
+                    if has_terminal?("{", false, index)
+                      r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                      @index += 1
+                    else
+                      terminal_parse_failure("{")
+                      r7 = nil
+                    end
                     s0 << r7
                     if r7
                       r8 = _nt_ws
                       s0 << r8
                       if r8
-                        if has_terminal?("}", false, index)
-                          r9 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                          @index += 1
-                        else
-                          terminal_parse_failure("}")
-                          r9 = nil
-                        end
+                        r9 = _nt_ExceptionMembers
                         s0 << r9
                         if r9
                           r10 = _nt_ws
                           s0 << r10
                           if r10
-                            if has_terminal?(";", false, index)
+                            if has_terminal?("}", false, index)
                               r11 = instantiate_node(SyntaxNode,input, index...(index + 1))
                               @index += 1
                             else
-                              terminal_parse_failure(";")
+                              terminal_parse_failure("}")
                               r11 = nil
                             end
                             s0 << r11
+                            if r11
+                              r12 = _nt_ws
+                              s0 << r12
+                              if r12
+                                if has_terminal?(";", false, index)
+                                  r13 = instantiate_node(SyntaxNode,input, index...(index + 1))
+                                  @index += 1
+                                else
+                                  terminal_parse_failure(";")
+                                  r13 = nil
+                                end
+                                s0 << r13
+                              end
+                            end
                           end
                         end
                       end

data/lib/webidl/parser/idl.treetop

@@ -21,11 +21,11 @@ module WebIDL
       end
 
       rule Interface
-        "interface" ws name:identifier ws inherits:InterfaceInheritance ws "{" ws members:InterfaceMembers ws "}" ws ";" <ParseTree::Interface>
+        "interface" ws name:identifier ws inherits:Inheritance ws "{" ws members:InterfaceMembers ws "}" ws ";" <ParseTree::Interface>
       end
 
-      rule InterfaceInheritance
-        (":" ws names:ScopedNameList <ParseTree::InterfaceInheritance>)?
+      rule Inheritance
+        (":" ws names:ScopedNameList <ParseTree::Inheritance>)?
       end
 
       # extract to a generic Members syntax node?
@@ -38,7 +38,7 @@ module WebIDL
       end
 
       rule Exception
-        "exception" ws name:identifier ws "{" ws members:ExceptionMembers ws "}" ws ";" <ParseTree::Exception>
+        "exception" ws name:identifier ws inherits:Inheritance ws "{" ws members:ExceptionMembers ws "}" ws ";" <ParseTree::Exception>
       end
 
       # extract to a generic Members syntax node?

data/lib/webidl/version.rb

@@ -1,3 +1,3 @@
 module WebIDL
-  VERSION = "0.0.9"
+  VERSION = "0.1.0"
 end

data/spec/ast_spec.rb

@@ -138,6 +138,12 @@ describe WebIDL::Ast do
     interface.inherits.first.qualified_name.should == "::foo"
   end
 
+  it "creates an exception with inheritance" do
+    exception = parse(fixture("exception_with_inheritance.idl")).build.last
+    exception.inherits.should_not be_empty
+    exception.inherits.first.name.should == "NotFoundException"
+  end
+
   it "creates an interface with an array type member" do
     interface = parse(fixture("interface_with_array_member.idl")).build.first
     interface.should be_kind_of(WebIDL::Ast::Interface)

data/spec/fixtures/exception_with_inheritance.idl

@@ -0,0 +1,3 @@
+exception NotFoundException { };
+exception NoSuchElementException : NotFoundException { };
+exception NoSuchFrameException : NotFoundException { };

metadata

@@ -2,7 +2,7 @@
 name: webidl
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jari Bakken
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-09 00:00:00 Z
+date: 2011-04-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: treetop
@@ -92,8 +92,8 @@ files:
 - lib/webidl/parse_tree/exception_field.rb
 - lib/webidl/parse_tree/extended_attributes.rb
 - lib/webidl/parse_tree/implements_statement.rb
+- lib/webidl/parse_tree/inheritance.rb
 - lib/webidl/parse_tree/interface.rb
-- lib/webidl/parse_tree/interface_inheritance.rb
 - lib/webidl/parse_tree/interface_members.rb
 - lib/webidl/parse_tree/module.rb
 - lib/webidl/parse_tree/nullable_type.rb
@@ -111,6 +111,7 @@ files:
 - spec/ast_spec.rb
 - spec/fixtures/empty_interface.idl
 - spec/fixtures/empty_module.idl
+- spec/fixtures/exception_with_inheritance.idl
 - spec/fixtures/framework.idl
 - spec/fixtures/html5.idl
 - spec/fixtures/interface_with_array_member.idl
@@ -167,6 +168,7 @@ test_files:
 - spec/ast_spec.rb
 - spec/fixtures/empty_interface.idl
 - spec/fixtures/empty_module.idl
+- spec/fixtures/exception_with_inheritance.idl
 - spec/fixtures/framework.idl
 - spec/fixtures/html5.idl
 - spec/fixtures/interface_with_array_member.idl