Finally got this damned thing actually executing JavaScript on Linux.

[cycript.git] / Cycript.y.in

diff --git a/Cycript.y.in b/Cycript.y.in
index 446daf09882f71d5516fd85b1773c8c7685f5869..37e76112ae5255b83faa780a4e82a77a0bd42b40 100644 (file)
--- a/Cycript.y.in
+++ b/Cycript.y.in
@@ -1,4 +1,4 @@
-/* Cycript - Remote Execution Server and Disassembler
+/* Cycript - Inlining/Optimizing JavaScript Compiler
  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 
@@ -47,7 +47,7 @@
 #include "Parser.hpp"
 
 @begin ObjectiveC
-#include "ObjectiveC.hpp"
+#include "ObjectiveC/Syntax.hpp"
 @end
 
 @begin E4X
@@ -66,7 +66,7 @@ typedef struct {
         CYAssignment *assignment_;
         CYBoolean *boolean_;
         CYClause *clause_;
-        CYCatch *catch_;
+        cy::Syntax::Catch *catch_;
         CYComprehension *comprehension_;
         CYCompound *compound_;
         CYDeclaration *declaration_;
@@ -1321,16 +1321,16 @@ LabelledStatement
 /* }}} */
 /* 12.13 The throw Statement {{{ */
 ThrowStatement
-    : "throw" Expression Terminator { $$ = new(driver.pool_) CYThrow($2); }
+    : "throw" Expression Terminator { $$ = new(driver.pool_) cy::Syntax::Throw($2); }
     ;
 /* }}} */
 /* 12.14 The try Statement {{{ */
 TryStatement
-    : "try" Block_ CatchOpt FinallyOpt { $$ = new(driver.pool_) CYTry($2, $3, $4); }
+    : "try" Block_ CatchOpt FinallyOpt { $$ = new(driver.pool_) cy::Syntax::Try($2, $3, $4); }
     ;
 
 CatchOpt
-    : "catch" "(" Identifier ")" Block_ { $$ = new(driver.pool_) CYCatch($3, $5); }
+    : "catch" "(" Identifier ")" Block_ { $$ = new(driver.pool_) cy::Syntax::Catch($3, $5); }
     | { $$ = NULL; }
     ;