[svn:parrot] r11942 - in trunk/languages/APL: . lib

[coke]

Author: coke
Date: Sun Mar 19 11:49:50 2006
New Revision: 11942

Modified:
   trunk/languages/APL/APL.pir
   trunk/languages/APL/TODO
   trunk/languages/APL/demo.apl
   trunk/languages/APL/lib/APL.g

Log:
Remove most of the perlish parts of the grammar.



Modified: trunk/languages/APL/APL.pir
==============================================================================
--- trunk/languages/APL/APL.pir (original)
+++ trunk/languages/APL/APL.pir Sun Mar 19 11:49:50 2006
@@ -13,7 +13,7 @@
 
     .local string source
     source = _get_source(args)
-    source = unicode:"print 10 \u00d7 2 ;\n"
+    source = unicode:"print 10 \u00d7 2\n"
 
 =for debug
 

Modified: trunk/languages/APL/TODO
==============================================================================
--- trunk/languages/APL/TODO    (original)
+++ trunk/languages/APL/TODO    Sun Mar 19 11:49:50 2006
@@ -3,9 +3,3 @@
 - allow precompilation of the TGE work - no reason to run this every runtime.
 
 - RT #38733 - can't read in utf-8 encoded files at the moment.
-
-'' strings - 
-
- -> (irc.perl.org) (11:45) From pmichaud, to #parrot: 
-  - rule delimited_single { ' [ '' | <-[']> ]* ' }
-  - rule delimited_double { " [ "" | <-["]> ]* " }                             
  

Modified: trunk/languages/APL/demo.apl
==============================================================================
--- trunk/languages/APL/demo.apl        (original)
+++ trunk/languages/APL/demo.apl        Sun Mar 19 11:49:50 2006
@@ -1 +1 @@
-print 10 × 2;
+print 10 × 2

Modified: trunk/languages/APL/lib/APL.g
==============================================================================
--- trunk/languages/APL/lib/APL.g       (original)
+++ trunk/languages/APL/lib/APL.g       Sun Mar 19 11:49:50 2006
@@ -2,24 +2,12 @@
 
 rule prog    { ^<APLGrammar::lineseq>$ }
 
-rule block { \s* \{ <APLGrammar::lineseq> \} \s* }
-
 rule lineseq { \s*<APLGrammar::line>*\s* }
 
-rule line    { 
-    [ <APLGrammar::label> <APLGrammar::cond> 
-    | <APLGrammar::label> <APLGrammar::expr>;
-    ] \s* 
-}
-
-rule label { \s* [<APLGrammar::word>\:]? \s* }
+rule line    { [ <APLGrammar::expr> ] \s* }
 
 rule word { \w[\w|\d]* }
 
-rule cond {
-    (if|unless) \s* \( \s* <APLGrammar::expr> \s* \) <APLGrammar::block>
-} 
-
 rule expr    { <APLGrammar::gprint> | <APLGrammar::cexpr> }
 
 rule gprint  { (print) \s* <APLGrammar::expr> }
@@ -29,15 +17,15 @@
 }
 
 rule term {
-    <APLGrammar::number>
+      <APLGrammar::number>
     | <APLGrammar::integer>
     | <APLGrammar::stringdouble>
     | <APLGrammar::stringsingle>
-    | do <APLGrammar::block>
 }
+
 rule integer { \d+ }
 rule number { \d+\.\d+ }
-rule stringdouble { <PGE::Text::bracketed: "> }
-rule stringsingle { <PGE::Text::bracketed: '> }
+rule stringdouble { " [ "" | <-["]> ]* " }
+rule stringsingle { ' [ '' | <-[']> ]* ' }