zomg 1.0.1 → 1.0.2

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.0.2
+
+* 2 bugfixes
+
+  * Generating attribute functions that raise rather than attr_accessors
+  * Removed extra "do not modify" comments
+
 === 1.0.1
 
 * 1 bugfix

data/lib/zomg/idl/lexer.rb

@@ -13,9 +13,9 @@ module ZOMG
 
     class Lexer < Racc::Parser
 
-module_eval <<'..end lib/yacc.y modeval..ideff8129053', 'lib/yacc.y', 861
+module_eval <<'..end lib/yacc.y modeval..id0b7ea27db0', 'lib/yacc.y', 861
   include ZOMG::IDL::Nodes
-..end lib/yacc.y modeval..ideff8129053
+..end lib/yacc.y modeval..id0b7ea27db0
 
 ##### racc 1.4.5 generates ###
 

data/lib/zomg/idl/visitors/ruby_sexp.rb

@@ -9,18 +9,29 @@ module ZOMG
         def visit_Module(o)
           [ :module,
             classify(o.name),
-            [:scope, [:block] + o.children.map { |c| c.accept(self) }]
+            [:scope, [:block] +
+              o.children.map { |c| c.accept(self) }.compact
+          ]
           ]
         end
 
         def visit_Interface(o)
           header = o.header.accept(self)
           header = header ? [:block, header] : [:block]
+          o.children.each { |c|
+            list = c.accept(self)
+            if list
+              if list.first.is_a?(Symbol)
+                header << list
+              else
+                header += list
+              end
+            end
+          }
           [ :module,
             classify(o.header.name),
             [:scope,
-              header +
-                o.children.map { |c| c.accept(self) }
+              header
             ]
           ]
         end
@@ -50,11 +61,31 @@ module ZOMG
         end
 
         def visit_Attribute(o)
-          [:fcall,
-            o.readonly ? :attr_reader : :attr_accessor,
-            [:array] +
-              o.children.map { |c| [:lit, c.accept(self)] }
-          ]
+          attributes = []
+          o.children.each { |name|
+            name = name.accept(self)
+
+            # Reader
+            attributes <<
+              [:defn, name.to_sym,
+                [:scope, [:block, [:args],
+                  [:fcall, :raise, [:array,
+                    [:call, [:const, :NotImplementedError], :new]]
+                  ]
+                ]]
+              ]
+            unless o.readonly
+              attributes <<
+                [:defn, :"#{name}=",
+                  [:scope, [:block, [:args, :_],
+                    [:fcall, :raise, [:array,
+                      [:call, [:const, :NotImplementedError], :new]]
+                    ]
+                  ]]
+                ]
+            end
+          }
+          attributes
         end
 
         def visit_ScopedName(o)

data/lib/zomg/version.rb

@@ -1,3 +1,3 @@
 module ZOMG
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/test/conversions/test_attribute.rb

@@ -19,10 +19,26 @@ module ZOMG
         assert sexp
         ruby_sexp =
           [:block,
-            [:module, :Foo,
-              [:scope, [:block,
-                [:fcall, :attr_accessor, [:array, [:lit, :awesome]]]
-        ]]]]
+           [:module,
+            :Foo,
+            [:scope,
+             [:block,
+              [:defn,
+               :awesome,
+               [:scope,
+                [:block,
+                 [:args],
+                 [:fcall,
+                  :raise,
+                  [:array, [:call, [:const, :NotImplementedError], :new]]]]]],
+              [:defn,
+               :awesome=,
+               [:scope,
+                [:block,
+                 [:args, :_],
+                 [:fcall,
+                  :raise,
+                  [:array, [:call, [:const, :NotImplementedError], :new]]]]]]]]]]
         assert_equal(ruby_sexp, sexp)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zomg
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-19 00:00:00 -07:00
+date: 2008-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency