treetop 1.1.0 → 1.1.1

data/Rakefile

@@ -15,7 +15,7 @@ end
 
 gemspec = Gem::Specification.new do |s|
   s.name = "treetop"
-  s.version = "1.1.0"
+  s.version = "1.1.1"
   s.author = "Nathan Sobo"
   s.email = "nathansobo@gmail.com"
   s.homepage = "http://functionalform.blogspot.com"

data/examples/lambda_calculus/arithmetic.treetop

@@ -4,9 +4,13 @@ grammar Arithmetic
   end
   
   rule comparative
-    exp_1:additive space '==' space exp_2:additive {
-      def eval(env={})
-        exp_1.eval(env) == exp_2.eval(env)
+    operand_1:additive space operator:equality_op space operand_2:additive <BinaryOperation>
+  end
+  
+  rule equality_op
+    '==' {
+      def apply(a, b)
+        a == b
       end
     }
   end
@@ -68,7 +72,7 @@ grammar Arithmetic
   end
 
   rule variable
-    [a-z] {
+    [a-z]+ {
       def eval(env={})
         env[name]
       end
@@ -80,13 +84,7 @@ grammar Arithmetic
   end
 
   rule number
-    [1-9] [0-9]* {
-      def eval(env={})
-        text_value.to_i
-      end
-    }
-    /
-    '0' {
+    ([1-9] [0-9]* / '0') {
       def eval(env={})
         text_value.to_i
       end

data/examples/lambda_calculus/lambda_calculus.treetop

@@ -105,23 +105,17 @@ grammar LambdaCalculus
   end
   
   rule variable
-    !keyword [a-z]+ {
-      def eval(env={})
-        env.has_key?(name) ? env[name] : self
-      end
-      
-      def bind(value, env)
-        env.merge(name => value)
-      end
-      
-      def name
-        text_value
-      end
-      
-      def to_s(env={})
-        env.has_key?(name) ? env[name].to_s : name
+    !keyword (
+      super {
+        def bind(value, env)
+          env.merge(name => value)
+        end
+
+        def to_s(env={})
+          env.has_key?(name) ? env[name].to_s : name
       end
-    }
+      }
+    )
   end
   
   rule keyword

data/lib/treetop/compiler/metagrammar.rb

@@ -893,7 +893,7 @@ module Treetop
       end
       
       module Primary1
-        def compile(address, builder)
+        def compile(address, builder, parent_expression=nil)
           prefix.compile(address, builder, self)
         end
     
@@ -925,7 +925,7 @@ module Treetop
       end
       
       module Primary3
-        def compile(address, builder)
+        def compile(address, builder, parent_expression=nil)
           suffix.compile(address, builder, self)
         end
     
@@ -957,7 +957,7 @@ module Treetop
       end
       
       module Primary5
-        def compile(address, builder)
+        def compile(address, builder, parent_expression=nil)
           atomic.compile(address, builder, self)
         end
     

data/lib/treetop/compiler/metagrammar.treetop

@@ -106,7 +106,7 @@ module Treetop
 
       rule primary
         prefix atomic {
-          def compile(address, builder)
+          def compile(address, builder, parent_expression=nil)
             prefix.compile(address, builder, self)
           end
       
@@ -124,7 +124,7 @@ module Treetop
         }
         /
         atomic suffix node_class_declarations {
-          def compile(address, builder)
+          def compile(address, builder, parent_expression=nil)
             suffix.compile(address, builder, self)
           end
       
@@ -146,7 +146,7 @@ module Treetop
         }
         /
         atomic node_class_declarations {
-          def compile(address, builder)
+          def compile(address, builder, parent_expression=nil)
             atomic.compile(address, builder, self)
           end
       

data/test/compiler/parenthesized_expression_test.rb

@@ -0,0 +1,17 @@
+require File.join(File.dirname(__FILE__), '..', 'test_helper')
+
+describe "An unadorned expression inside of parentheses", :extend => CompilerTestCase do
+  testing_expression '("foo")'
+  
+  it "should behave as normal" do
+    parse('foo').should be_success
+  end
+end
+
+describe "A prefixed-expression inside of parentheses", :extend => CompilerTestCase do
+  testing_expression '(!"foo")'
+  
+  it "should behave as normal" do
+    parse('foo').should_not be_success
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: treetop
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2007-10-25 00:00:00 -07:00
+  version: 1.1.1
+date: 2007-11-05 00:00:00 -08:00
 summary: A Ruby-based text parsing and interpretation DSL
 require_paths: 
 - lib
@@ -32,10 +32,15 @@ files:
 - README
 - Rakefile
 - test/compilation_target
+- test/compiler
+- test/composition
+- test/parser
+- test/ruby_extensions
+- test/screw
+- test/test_helper.rb
 - test/compilation_target/target.rb
 - test/compilation_target/target.treetop
 - test/compilation_target/target_test.rb
-- test/compiler
 - test/compiler/and_predicate_test.rb
 - test/compiler/anything_symbol_test.rb
 - test/compiler/character_class_test.rb
@@ -48,31 +53,27 @@ files:
 - test/compiler/not_predicate_test.rb
 - test/compiler/one_or_more_test.rb
 - test/compiler/optional_test.rb
+- test/compiler/parenthesized_expression_test.rb
 - test/compiler/parsing_rule_test.rb
 - test/compiler/sequence_test.rb
 - test/compiler/terminal_symbol_test.rb
 - test/compiler/test_grammar.treetop
 - test/compiler/zero_or_more_test.rb
-- test/composition
 - test/composition/a.treetop
 - test/composition/b.treetop
 - test/composition/c.treetop
 - test/composition/d.treetop
 - test/composition/grammar_composition_test.rb
-- test/parser
 - test/parser/syntax_node_test.rb
 - test/parser/terminal_parse_failure_test.rb
-- test/ruby_extensions
 - test/ruby_extensions/string_test.rb
-- test/screw
 - test/screw/Rakefile
 - test/screw/unit
+- test/screw/unit.rb
 - test/screw/unit/assertion_failed_error.rb
 - test/screw/unit/assertions.rb
 - test/screw/unit/auto_runner.rb
 - test/screw/unit/collector
-- test/screw/unit/collector/dir.rb
-- test/screw/unit/collector/objectspace.rb
 - test/screw/unit/collector.rb
 - test/screw/unit/error.rb
 - test/screw/unit/failure.rb
@@ -81,34 +82,42 @@ files:
 - test/screw/unit/test_result.rb
 - test/screw/unit/test_suite.rb
 - test/screw/unit/ui
+- test/screw/unit/ui.rb
+- test/screw/unit/util
+- test/screw/unit/util.rb
+- test/screw/unit/collector/dir.rb
+- test/screw/unit/collector/objectspace.rb
 - test/screw/unit/ui/console
-- test/screw/unit/ui/console/test_runner.rb
 - test/screw/unit/ui/fox
-- test/screw/unit/ui/fox/test_runner.rb
 - test/screw/unit/ui/gtk
-- test/screw/unit/ui/gtk/test_runner.rb
 - test/screw/unit/ui/gtk2
-- test/screw/unit/ui/gtk2/testrunner.rb
 - test/screw/unit/ui/test_runner_mediator.rb
 - test/screw/unit/ui/test_runner_utilities.rb
 - test/screw/unit/ui/tk
+- test/screw/unit/ui/console/test_runner.rb
+- test/screw/unit/ui/fox/test_runner.rb
+- test/screw/unit/ui/gtk/test_runner.rb
+- test/screw/unit/ui/gtk2/testrunner.rb
 - test/screw/unit/ui/tk/test_runner.rb
-- test/screw/unit/ui.rb
-- test/screw/unit/util
 - test/screw/unit/util/backtrace_filter.rb
 - test/screw/unit/util/observable.rb
 - test/screw/unit/util/proc_wrapper.rb
-- test/screw/unit/util.rb
-- test/screw/unit.rb
-- test/test_helper.rb
 - lib/treetop
+- lib/treetop.rb
 - lib/treetop/compiler
+- lib/treetop/compiler.rb
+- lib/treetop/ruby_extensions
+- lib/treetop/ruby_extensions.rb
+- lib/treetop/runtime
+- lib/treetop/runtime.rb
 - lib/treetop/compiler/grammar_compiler.rb
 - lib/treetop/compiler/lexical_address_space.rb
 - lib/treetop/compiler/load_grammar.rb
 - lib/treetop/compiler/metagrammar.rb
 - lib/treetop/compiler/metagrammar.treetop
 - lib/treetop/compiler/node_classes
+- lib/treetop/compiler/node_classes.rb
+- lib/treetop/compiler/ruby_builder.rb
 - lib/treetop/compiler/node_classes/anything_symbol.rb
 - lib/treetop/compiler/node_classes/atomic_expression.rb
 - lib/treetop/compiler/node_classes/character_class.rb
@@ -126,13 +135,7 @@ files:
 - lib/treetop/compiler/node_classes/sequence.rb
 - lib/treetop/compiler/node_classes/terminal.rb
 - lib/treetop/compiler/node_classes/treetop_file.rb
-- lib/treetop/compiler/node_classes.rb
-- lib/treetop/compiler/ruby_builder.rb
-- lib/treetop/compiler.rb
-- lib/treetop/ruby_extensions
 - lib/treetop/ruby_extensions/string.rb
-- lib/treetop/ruby_extensions.rb
-- lib/treetop/runtime
 - lib/treetop/runtime/compiled_parser.rb
 - lib/treetop/runtime/node_cache.rb
 - lib/treetop/runtime/parse_cache.rb
@@ -141,10 +144,9 @@ files:
 - lib/treetop/runtime/syntax_node.rb
 - lib/treetop/runtime/terminal_parse_failure.rb
 - lib/treetop/runtime/terminal_syntax_node.rb
-- lib/treetop/runtime.rb
-- lib/treetop.rb
 - bin/tt
 - examples/lambda_calculus
+- examples/TALK
 - examples/lambda_calculus/arithmetic.treetop
 - examples/lambda_calculus/arithmetic_node_classes.rb
 - examples/lambda_calculus/arithmetic_test.rb
@@ -152,7 +154,6 @@ files:
 - examples/lambda_calculus/lambda_calculus_node_classes.rb
 - examples/lambda_calculus/lambda_calculus_test.rb
 - examples/lambda_calculus/test_helper.rb
-- examples/TALK
 test_files: []
 
 rdoc_options: []