Author: bernhard
Date: Sat Jan 6 12:11:51 2007
New Revision: 16437
Modified:
trunk/languages/plumhead/lib/Parrot/Test/Plumhead/Antlr3.pm
trunk/languages/plumhead/src/antlr3/GenPastPirTreeParser.java
trunk/languages/plumhead/src/antlr3/PlumheadLexer.java
trunk/languages/plumhead/src/antlr3/PlumheadParser.java
trunk/languages/plumhead/t/arithmetics.t
Log:
[Plumhead antlr3]
A trailting newline was lost.
Modified: trunk/languages/plumhead/lib/Parrot/Test/Plumhead/Antlr3.pm
==============================================================================
--- trunk/languages/plumhead/lib/Parrot/Test/Plumhead/Antlr3.pm (original)
+++ trunk/languages/plumhead/lib/Parrot/Test/Plumhead/Antlr3.pm Sat Jan 6
12:11:51 2007
@@ -24,7 +24,7 @@
# still confused about ANTLR3 non-greedy matching,
# As a workaround, preprocesses the PHP source with Perl5
- my $do_anno = q{s/^/start_sea/; s/<\?php[ |\n]/end_sea<?php /;
s/\?>/?>start_sea/; s/$/end_sea/;};
+ my $do_anno = q{s/^/start_sea/; s/<\?php[ |\n]/end_sea<?php /;
s/(\?>\s*)/${1}start_sea/; $_ .= 'end_sea';};
return "perl -p -i -0777 -e '$do_anno' languages/${lang_fn} && ./parrot
languages/plumhead/plumhead.pbc --variant=antlr3 languages/${lang_fn}";
}
Modified: trunk/languages/plumhead/src/antlr3/GenPastPirTreeParser.java
==============================================================================
--- trunk/languages/plumhead/src/antlr3/GenPastPirTreeParser.java
(original)
+++ trunk/languages/plumhead/src/antlr3/GenPastPirTreeParser.java Sat Jan
6 12:11:51 2007
@@ -1,4 +1,4 @@
-// $ANTLR 3.0b5 src/antlr3/GenPastPir.g 2007-01-06 19:05:11
+// $ANTLR 3.0b5 src/antlr3/GenPastPir.g 2007-01-06 20:10:30
import java.util.regex.*;
Modified: trunk/languages/plumhead/src/antlr3/PlumheadLexer.java
==============================================================================
--- trunk/languages/plumhead/src/antlr3/PlumheadLexer.java (original)
+++ trunk/languages/plumhead/src/antlr3/PlumheadLexer.java Sat Jan 6
12:11:51 2007
@@ -1,4 +1,4 @@
-// $ANTLR 3.0b5 src/antlr3/Plumhead.g 2007-01-06 19:05:09
+// $ANTLR 3.0b5 src/antlr3/Plumhead.g 2007-01-06 20:10:29
import org.antlr.runtime.*;
import java.util.Stack;
Modified: trunk/languages/plumhead/src/antlr3/PlumheadParser.java
==============================================================================
--- trunk/languages/plumhead/src/antlr3/PlumheadParser.java (original)
+++ trunk/languages/plumhead/src/antlr3/PlumheadParser.java Sat Jan 6
12:11:51 2007
@@ -1,4 +1,4 @@
-// $ANTLR 3.0b5 src/antlr3/Plumhead.g 2007-01-06 19:05:09
+// $ANTLR 3.0b5 src/antlr3/Plumhead.g 2007-01-06 20:10:28
import org.antlr.runtime.*;
import java.util.Stack;
Modified: trunk/languages/plumhead/t/arithmetics.t
==============================================================================
--- trunk/languages/plumhead/t/arithmetics.t (original)
+++ trunk/languages/plumhead/t/arithmetics.t Sat Jan 6 12:11:51 2007
@@ -52,51 +52,54 @@
}
}
-my @tests
- = ( [ '1', [ 1 ], 'positive 1', ],
- [ '-1', [ -1 ], 'negative 1', ],
- [ '1 + 1', [ 2 ], 'one plus one', ],
- [ '0', [ 0 ], 'zero', ],
- [ '2', [ 2 ], 'positive int', ],
- [ '12345678', [ 12345678 ], 'another positive int', ],
- [ '-12345678', [ -12345678 ], 'another negative int', ],
- [ '1 + 2', '3', 'two summands', ],
- [ '1 + 2 + 3', '6', 'three summands', ],
- [ '1 + 0 + 3', '4', 'three summands including 0', ],
- [ '1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14', '105',
'Gauss was right', ],
- [ '-1 + 10', '9', 'negative int in expression', ],
- [ '2 - 1', '1', ],
- [ '1 - 1', '0', ],
- [ '1 - 2', '-1', ],
- [ '-1 - -2', '1', ],
- [ '-1 + -2 - -4 + 10', '11', ],
- [ '- 1 - - 6 + 3 - 2', '6', ],
- [ '2 * 2', '4', ],
- [ '2 / 2', '1', ],
- [ '2 % 2', '0', ],
- [ '3 % 2', '1', ],
- [ '2 / 2 + .1', '1.1', ],
- [ '2 * 2 + .4', '4.4', ],
- [ '.1 - 6 / 2', '-2.9', ],
- [ '2 % 2 + 4', '4', ],
- [ ' ( 1 ) ', '1', 'one in parenthesis', ],
- [ ' ( 1 + 2 ) - 3 ', '0', ],
- [ ' - ( 9 ) ', '-9', ],
- [ ' - ( - ( 9 ) ) ', '9', ],
- [ ' - ( - ( - ( 9 ) ) ) ', '-9', ],
- [ ' - ( 1 + 2 ) ', '-3', ],
- [ ' - ( 1 + 2 ) - 3 ', '-6', ],
- [ ' ( 1 + 2 ) - ( 5 + 1 - 2 ) + 7 - ( 8 - 100 ) ', '98', ],
- [ ' ( 1 + 2 ) * 3 ', '9', ],
- [ ' ( 1 * 2 ) * 3 ', '6', ],
- [ ' ( 1 * 2 ) + 3 ', '5', ],
- [ ' ( 1 * 2 ) + ( ( ( ( 3 + 4 ) + 5 ) * 6 ) * 7 ) ', '506', ],
- [ '.1', '0.1', 'Parrot says 0.1', ],
- [ '-.1', '-0.1', 'Parrot bc says -0.1',],
- [ '-1.0000001', '-1.0000001', 'probably limited precission of Float
PMC', ],
- [ '1 & 3', '1', 'bitwise and', ],
- [ '1 | 2', '3', 'bitwise or', ],
- );
+my @tests = (
+ [ '1', [ 1 ], 'positive 1', ],
+ [ '-1', [ -1 ], 'negative 1', ],
+ [ '1 + 1', [ 2 ], 'one plus one', ],
+ [ '0', [ 0 ], 'zero', ],
+ [ '2', [ 2 ], 'positive int', ],
+ [ '12345678', [ 12345678 ], 'another positive int', ],
+ [ '-12345678', [ -12345678 ], 'another negative int', ],
+ [ '1 + 2', '3', 'two summands', ],
+ [ '1 + 2 + 3', '6', 'three summands', ],
+ [ '1 + 0 + 3', '4', 'three summands including 0', ],
+ [ '1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14', '105',
'Gauss was right', ],
+ [ '-1 + 10', '9', 'negative int in expression', ],
+ [ '2 - 1', '1', ],
+ [ '1 - 1', '0', ],
+ [ '1 - 2', '-1', ],
+ [ '-1 - -2', '1', ],
+ [ '-1 + -2 - -4 + 10', '11', ],
+ [ '- 1 - - 6 + 3 - 2', '6', ],
+ [ '2 * 2', '4', ],
+ [ '2 / 2', '1', ],
+ [ '2 % 2', '0', ],
+ [ '3 % 2', '1', ],
+ [ '2 / 2 + .1', '1.1', ],
+ [ '2 * 2 + .4', '4.4', ],
+ [ '.1 - 6 / 2', '-2.9', ],
+ [ '2 % 2 + 4', '4', ],
+ [ ' ( 1 ) ', '1', 'one in parenthesis', ],
+ [ ' ( 1 + 2 ) - 3 ', '0', ],
+ [ ' - ( 9 ) ', '-9', ],
+ [ ' - ( - ( 9 ) ) ', '9', ],
+ [ ' - ( - ( - ( 9 ) ) ) ', '-9', ],
+ [ ' - ( 1 + 2 ) ', '-3', ],
+ [ ' - ( 1 + 2 ) - 3 ', '-6', ],
+ [ ' ( 1 + 2 ) - ( 5 + 1 - 2 ) + 7 - ( 8 - 100 ) ', '98', ],
+ [ ' ( 1 + 2 ) * 3 ', '9', ],
+ [ ' ( 1 * 2 ) * 3 ', '6', ],
+ [ ' ( 1 * 2 ) + 3 ', '5', ],
+ [ ' ( 1 * 2 ) + ( ( ( ( 3 + 4 ) + 5 ) * 6 ) * 7 ) ', '506', ],
+ [ '.1', '0.1', 'Parrot says 0.1', ],
+ [ '-.1', '-0.1', 'Parrot bc says -0.1',],
+ [ '-1.0000001', '-1.0000001', 'probably limited precission of Float PMC',
],
+ [ '1 & 3', '1', 'bitwise and', ],
+ [ '1 | 2', '3', 'bitwise or', ],
+);
[EMAIL PROTECTED] = (
+ [ '1', [ 1 ], 'positive 1', ],
+);
plan( tests => scalar(@tests) );
run_tests([EMAIL PROTECTED]);
