citrus 2.3.4 → 2.3.5

data/CHANGES

@@ -1,3 +1,15 @@
+= 2.3.5 / 2011-02-07
+
+  * Fixed a bug that prevented Match objects from being printed properly using
+    Kernel#puts (thanks joachimm).
+
+  * Fixed a bug that prevented using rules with names that begin with "end"
+    (thanks Mark Wilden).
+
+  * Citrus#require accepts relative file paths, in addition to absolute ones.
+
+  * Simplified/cleaned up some example files.
+
 = 2.3.4 / 2011-01-17
 
   * Added CHANGES file.

data/README

@@ -572,13 +572,13 @@ To install the [Vim](http://www.vim.org/) scripts, copy the files in
 
 The project source directory contains several example scripts that demonstrate
 how grammars are to be constructed and used. Each Citrus file in the examples
-directory has an accompanying Ruby file with the same name that contains a suite
-of tests for that particular file.
+directory has an accompanying Ruby file that contains a suite of tests for that
+particular file.
 
 The best way to run any of these examples is to pass the name of the Ruby file
 directly to the Ruby interpreter on the command line, e.g.:
 
-    $ ruby -Ilib examples/calc.rb
+    $ ruby -Ilib examples/calc_test.rb
 
 This particular invocation uses the `-I` flag to ensure that you are using the
 version of Citrus that was bundled with that particular example file (i.e. the

data/Rakefile

@@ -6,7 +6,7 @@ task :default => :test
 # TESTS #######################################################################
 
 Rake::TestTask.new(:test) do |t|
-  t.test_files = FileList['test/*_test.rb'] + FileList['examples/*.rb']
+  t.test_files = FileList['test/*_test.rb'] + FileList['examples/*_test.rb']
 end
 
 # DOCS ########################################################################

data/benchmark/after.dat

@@ -0,0 +1,192 @@
+12 0
+30 0
+35 0
+1749 10
+1962 9
+2383 9
+3728 29
+3919 30
+3952 30
+3995 30
+4063 39
+4325 30
+4527 29
+4570 40
+4607 39
+4654 29
+4679 40
+4774 39
+4968 29
+5059 39
+5383 49
+5915 40
+6109 49
+6122 49
+6218 50
+6332 49
+6681 59
+7440 60
+7530 60
+7605 60
+8155 70
+8402 60
+8420 60
+8617 70
+8635 59
+8841 70
+8843 70
+8852 80
+9151 69
+9271 80
+9521 80
+9525 69
+9566 70
+9584 79
+9642 70
+10138 80
+10181 80
+10225 80
+10338 79
+10449 80
+10629 80
+10763 89
+10817 79
+11059 80
+11062 89
+11215 89
+11698 89
+11891 89
+11945 90
+11956 89
+12018 89
+12053 89
+12178 100
+12283 89
+12326 99
+12430 99
+12438 89
+12572 89
+12638 100
+12687 90
+12703 89
+12896 99
+12922 99
+12996 100
+13137 110
+13211 99
+13462 110
+13477 109
+13576 109
+13577 109
+13584 99
+13605 119
+13631 109
+14216 109
+14237 110
+14260 109
+14367 120
+14371 109
+14741 110
+14893 129
+14910 109
+14917 109
+14977 109
+15049 120
+15191 109
+15382 120
+15618 120
+15623 120
+15629 120
+15856 120
+16496 130
+16512 130
+16956 130
+17074 130
+17237 129
+17371 140
+17568 130
+17945 139
+18147 139
+18343 139
+18417 139
+18823 140
+18970 150
+19285 150
+19333 140
+19500 150
+19548 149
+19634 149
+19673 150
+19689 160
+19909 150
+20054 149
+20107 150
+20248 160
+20580 160
+20744 160
+20806 160
+20954 160
+21034 160
+21187 160
+21303 160
+21450 160
+21626 169
+21931 169
+21950 169
+22359 169
+22626 169
+22638 169
+22772 169
+22885 169
+22897 170
+23114 179
+23242 179
+23428 180
+23452 179
+23495 189
+23499 180
+23558 190
+23744 179
+23881 180
+23945 179
+24361 189
+24501 190
+24642 189
+24672 190
+24694 190
+24706 190
+24931 199
+25065 189
+25140 189
+25402 189
+25702 199
+25743 199
+27139 210
+27316 209
+27333 210
+27414 209
+27771 220
+27798 210
+28583 230
+28906 219
+29025 230
+29209 229
+29272 219
+29273 219
+29359 229
+29577 220
+30886 240
+31170 240
+31593 240
+32460 250
+32486 250
+32630 250
+33010 259
+33137 259
+33142 250
+33739 259
+39880 309
+39940 319
+42952 320
+43227 329
+52855 420

data/benchmark/before.dat

@@ -0,0 +1,192 @@
+12 1
+30 0
+35 0
+1749 59
+1962 30
+2383 29
+3728 50
+3919 50
+3952 60
+3995 130
+4063 49
+4325 140
+4527 109
+4570 50
+4607 60
+4654 89
+4679 80
+4774 70
+4968 80
+5059 159
+5383 60
+5915 80
+6109 119
+6122 169
+6218 69
+6332 70
+6681 90
+7440 89
+7530 129
+7605 89
+8155 159
+8402 169
+8420 179
+8617 100
+8635 119
+8841 169
+8843 169
+8852 140
+9151 220
+9271 169
+9521 199
+9525 160
+9566 120
+9584 170
+9642 120
+10138 200
+10181 119
+10225 120
+10338 149
+10449 199
+10629 150
+10763 189
+10817 199
+11059 179
+11062 179
+11215 190
+11698 180
+11891 219
+11945 209
+11956 200
+12018 170
+12053 139
+12178 249
+12283 199
+12326 170
+12430 210
+12438 180
+12572 189
+12638 220
+12687 209
+12703 170
+12896 200
+12922 229
+12996 169
+13137 220
+13211 219
+13462 289
+13477 189
+13576 220
+13577 179
+13584 269
+13605 209
+13631 219
+14216 240
+14237 190
+14260 199
+14367 210
+14371 240
+14741 289
+14893 240
+14910 189
+14917 250
+14977 289
+15049 250
+15191 209
+15382 239
+15618 269
+15623 239
+15629 260
+15856 259
+16496 310
+16512 270
+16956 279
+17074 239
+17237 259
+17371 289
+17568 350
+17945 310
+18147 250
+18343 279
+18417 300
+18823 310
+18970 290
+19285 300
+19333 299
+19500 319
+19548 299
+19634 300
+19673 309
+19689 380
+19909 310
+20054 299
+20107 349
+20248 299
+20580 300
+20744 329
+20806 340
+20954 279
+21034 320
+21187 300
+21303 280
+21450 310
+21626 339
+21931 370
+21950 320
+22359 379
+22626 320
+22638 339
+22772 359
+22885 359
+22897 330
+23114 330
+23242 329
+23428 339
+23452 339
+23495 370
+23499 360
+23558 350
+23744 359
+23881 340
+23945 320
+24361 339
+24501 339
+24642 400
+24672 340
+24694 320
+24706 349
+24931 350
+25065 380
+25140 350
+25402 379
+25702 349
+25743 429
+27139 420
+27316 520
+27333 410
+27414 370
+27771 399
+27798 410
+28583 370
+28906 409
+29025 519
+29209 390
+29272 489
+29273 449
+29359 480
+29577 470
+30886 510
+31170 469
+31593 429
+32460 519
+32486 500
+32630 480
+33010 469
+33137 489
+33142 480
+33739 560
+39880 599
+39940 609
+42952 629
+43227 620
+52855 780

data/examples/calc.citrus

@@ -11,8 +11,8 @@ grammar Calc
   end
 
   rule additive
-    (factor additive_operator term) {
-      additive_operator.value(factor.value, term.value)
+    (factor operator:('+' | '-') space* term) {
+      factor.value.send(operator.to_s, term.value)
     }
   end
 
@@ -21,8 +21,8 @@ grammar Calc
   end
 
   rule multiplicative
-    (prefix multiplicative_operator factor) {
-      multiplicative_operator.value(prefix.value, factor.value)
+    (prefix operator:('*' | '/' | '%') space* factor) {
+      prefix.value.send(operator.to_s, factor.value)
     }
   end
 
@@ -31,8 +31,10 @@ grammar Calc
   end
 
   rule prefixed
-    (unary_operator prefix) {
-      unary_operator.value(prefix.value)
+    (operator:('-' | '+' | '~') space* prefix) {
+      s = operator.to_s
+      s += '@' unless s == '~' # Unary + and - require an @.
+      prefix.value.send(s)
     }
   end
 
@@ -41,8 +43,8 @@ grammar Calc
   end
 
   rule exponential
-    (primary exponential_operator prefix) {
-      exponential_operator.value(primary.value, prefix.value)
+    (primary operator:'**' space* prefix) {
+      primary.value.send(operator.to_s, prefix.value)
     }
   end
 
@@ -63,45 +65,15 @@ grammar Calc
   end
 
   rule float
-    (digits '.' digits space*) {
-      strip.to_f
-    }
+    (digits '.' digits space*) { to_f }
   end
 
   rule integer
-    (digits space*) {
-      strip.to_i
-    }
+    (digits space*) { to_i }
   end
 
   rule digits
-    # Numbers may contain underscores in Ruby.
-    [0-9]+ ('_' [0-9]+)*
-  end
-
-  rule additive_operator
-    (('+' | '-') space*) { |a, b|
-      a.send(strip, b)
-    }
-  end
-
-  rule multiplicative_operator
-    (('*' | '/' | '%') space*) { |a, b|
-      a.send(strip, b)
-    }
-  end
-
-  rule exponential_operator
-    ('**' space*) { |a, b|
-      a ** b
-    }
-  end
-
-  rule unary_operator
-    (('~' | '+' | '-') space*) { |n|
-      # Unary + and - require an @.
-      n.send(strip == '~' ? strip : '%s@' % strip)
-    }
+    [0-9]+ ('_' [0-9]+)* # Numbers may contain underscores.
   end
 
   rule lparen '(' space* end