Revert "* Update [if] to find other builtins."

This reverts commit ab46f55.
partcl · Oct 1, 2012 · d80dc8b · d80dc8b
1 parent ab46f55
commit d80dc8b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/build/Makefile.in b/build/Makefile.in
@@ -115,7 +115,7 @@ GEN_SOURCES = \
 all: $(PARTCL_EXE) .revision
 
 src/Partcl.pir: $(GEN_SOURCES) 
-src/Partcl/commands.pm: $(COMMANDS) src/init.pm src/Partcl/Grammar.pir
+src/Partcl/commands.pm: $(COMMANDS) src/init.pm
 	echo "class Builtins {" > src/Partcl/commands.pm
 	cat $(COMMANDS) >>  src/Partcl/commands.pm
 	echo "}" >> src/Partcl/commands.pm

diff --git a/src/Partcl/commands/expr.pm b/src/Partcl/commands/expr.pm
@@ -1,6 +1,3 @@
-use src::Partcl::Grammar;
-use QAST;
-
 method expr(*@args) {
     my $code := nqp::join(' ', @args);
     error("empty expression\nin expression \"\"")
@@ -16,7 +13,7 @@ method expr(*@args) {
                 :actions(Partcl::Actions)
             );
         if $parse {
-            &sub := QAST::Compiler.compile($parse.ast);
+            &sub := PAST::Compiler.compile($parse.ast);
             %EXPRCACHE{$code} := &sub;
         } else {
             error("Invalid expression");

diff --git a/src/Partcl/commands/if.pm b/src/Partcl/commands/if.pm
@@ -12,7 +12,7 @@ method if(*@args) {
 
             $body := @args.shift;
         }
-        if self.expr($expr) { return self.eval($body); }
+        if expr($expr) { return eval($body); }
         if @args {
             my $else := @args.shift;
             if $else ne 'elseif' {