Mostly fixed the E4X situation, checkpointing for NoRE hell.

diff --git a/Cycript.y.in b/Cycript.y.in
index a77265f3538f5b0e7ab46560dc7f5469625bfa6f..1789d47b7aff735022da699a2e1390b08513df37 100644 (file)
--- a/Cycript.y.in
+++ b/Cycript.y.in
@@ -51,7 +51,7 @@
 @end
 
 @begin E4X
 @end
 
 @begin E4X

-#include "E4X.hpp"
+#include "E4X/Syntax.hpp"

 @end
 
 typedef struct {
 @end
 
 typedef struct {


@@ -103,6 +103,8 @@ typedef struct {
 
 @begin E4X
         CYAttribute *attribute_;
 
 @begin E4X
         CYAttribute *attribute_;

+        CYPropertyIdentifier *propertyIdentifier_;
+        CYSelector *selector_;

 @end
     };
 } YYSTYPE;
 @end
     };
 } YYSTYPE;


@@ -437,6 +439,7 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <expression_> PrimaryExpressionBF
 %type <statement_> Program
 %type <propertyName_> PropertyName
 %type <expression_> PrimaryExpressionBF
 %type <statement_> Program
 %type <propertyName_> PropertyName

+%type <propertyName_> PropertyName_

 %type <property_> PropertyNameAndValueList
 %type <property_> PropertyNameAndValueList_
 %type <property_> PropertyNameAndValueListOpt
 %type <property_> PropertyNameAndValueList
 %type <property_> PropertyNameAndValueList_
 %type <property_> PropertyNameAndValueListOpt


@@ -504,9 +507,9 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 @end
 
 @begin E4X
 @end
 
 @begin E4X

-%type <identifier_> PropertyIdentifier_
-%type <identifier_> PropertySelector
-%type <identifier_> PropertySelector_
+%type <propertyIdentifier_> PropertyIdentifier_
+%type <selector_> PropertySelector
+%type <selector_> PropertySelector_

 %type <identifier_> QualifiedIdentifier
 %type <identifier_> QualifiedIdentifier_
 %type <identifier_> WildcardIdentifier
 %type <identifier_> QualifiedIdentifier
 %type <identifier_> QualifiedIdentifier_
 %type <identifier_> WildcardIdentifier


@@ -518,13 +521,22 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <identifier_> XMLPI
 
 %type <attribute_> AttributeIdentifier
 %type <identifier_> XMLPI
 
 %type <attribute_> AttributeIdentifier

-%type <statement_> DefaultXMLNamespaceStatement
+/* XXX: %type <statement_> DefaultXMLNamespaceStatement */

 %type <expression_> PropertyIdentifier
 %type <expression_> XMLListInitialiser
 %type <expression_> XMLInitialiser
 @end
 
 %type <expression_> PropertyIdentifier
 %type <expression_> XMLListInitialiser
 %type <expression_> XMLInitialiser
 @end
 

-/*
+%token WC
+
+%nonassoc Identifier_ "abstract" "boolean" "break" "byte" "case" "catch" "char" "class" "const" "continue" "debugger" "default" "delete" "do" "double" "each" "enum" "export" "extends" "false" "final" "finally" "float" /*"for"*/ "function" "goto" "implements" "import" /*"in"*/ /*"instanceof"*/ "int" "interface" "let" "long" "namespace" "native" "new" "null" "package" "private" "protected" "public" "return" "short" "super" "static" "switch" "synchronized" "this" "throw" "throws" "transient" "true" "try" "typeof" "var" "void" "volatile" "while" "with" "xml" "yield"
+
+%nonassoc "if"
+%nonassoc "else"
+
+%nonassoc "++" "--"
+%nonassoc "(" "["
+

 %left "*" "/" "%"
 %left "+" "-"
 %left "<<" ">>" ">>>"
 %left "*" "/" "%"
 %left "+" "-"
 %left "<<" ">>" ">>>"


@@ -537,10 +549,6 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %left "||"
 
 %right "=" "*=" "/=" "%=" "+=" "-=" "<<=" ">>=" ">>>=" "&=" "^=" "|="
 %left "||"
 
 %right "=" "*=" "/=" "%=" "+=" "-=" "<<=" ">>=" ">>>=" "&=" "^=" "|="

-*/
-
-%nonassoc "if"
-%nonassoc "else"

 
 %start Program
 
 
 %start Program
 


@@ -672,6 +680,7 @@ LiteralNoRE
     | BooleanLiteral { $$ = $1; }
     | NumericLiteral { $$ = $1; }
     | StringLiteral { $$ = $1; }
     | BooleanLiteral { $$ = $1; }
     | NumericLiteral { $$ = $1; }
     | StringLiteral { $$ = $1; }

+    | "@" StringLiteral { $$ = $2; }

     ;
 
 LiteralRE
     ;
 
 LiteralRE


@@ -771,11 +780,15 @@ PropertyNameAndValueList
     : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = new(driver.pool_) CYProperty($1, $3, $4); }
     ;
 
     : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = new(driver.pool_) CYProperty($1, $3, $4); }
     ;
 

-PropertyName
+PropertyName_

     : Identifier { $$ = $1; }
     | StringLiteral { $$ = $1; }
     | NumericLiteral { $$ = $1; }
     ;
     : Identifier { $$ = $1; }
     | StringLiteral { $$ = $1; }
     | NumericLiteral { $$ = $1; }
     ;

+
+PropertyName
+    : LexSetRegExp PropertyName_ { $$ = $2; }
+    ;

 /* }}} */
 
 /* 11.2 Left-Hand-Side Expressions {{{ */
 /* }}} */
 
 /* 11.2 Left-Hand-Side Expressions {{{ */


@@ -802,7 +815,7 @@ MemberExpressionNoBF
     ;
 
 MemberExpressionNoWC
     ;
 
 MemberExpressionNoWC

-    : PrimaryExpressionNoWC { $$ = $1; }
+    : PrimaryExpression { $$ = $1; }

     | FunctionExpression { $$ = $1; }
     | MemberExpression MemberAccess { $2->SetLeft($1); $$ = $2; }
     | LexSetRegExp MemberExpression_ { $$ = $2; }
     | FunctionExpression { $$ = $1; }
     | MemberExpression MemberAccess { $2->SetLeft($1); $$ = $2; }
     | LexSetRegExp MemberExpression_ { $$ = $2; }


@@ -957,7 +970,7 @@ AdditiveExpressionNoBF
     ;
 
 AdditiveExpressionNoWC
     ;
 
 AdditiveExpressionNoWC

-    : MultiplicativeExpressionNoWC{ $$ = $1; }
+    : MultiplicativeExpressionNoWC { $$ = $1; }

     | AdditiveExpression "+" MultiplicativeExpression { $$ = new(driver.pool_) CYAdd($1, $3); }
     | AdditiveExpression "-" MultiplicativeExpression { $$ = new(driver.pool_) CYSubtract($1, $3); }
     ;
     | AdditiveExpression "+" MultiplicativeExpression { $$ = new(driver.pool_) CYAdd($1, $3); }
     | AdditiveExpression "-" MultiplicativeExpression { $$ = new(driver.pool_) CYSubtract($1, $3); }
     ;


@@ -1726,7 +1739,7 @@ XMLMarkup
 /* }}} */
 /* 11.1 Primary Expressions {{{ */
 PrimaryExpressionWC
 /* }}} */
 /* 11.1 Primary Expressions {{{ */
 PrimaryExpressionWC

-    : PropertyIdentifier { $$ = $1; }
+    : PropertyIdentifier { $$ = new(driver.pool_) CYPropertyVariable($1); }

     | XMLInitialiser { $$ = $1; }
     | XMLListInitialiser { $$ = $1; }
     ;
     | XMLInitialiser { $$ = $1; }
     | XMLListInitialiser { $$ = $1; }
     ;


@@ -1743,23 +1756,23 @@ AttributeIdentifier
     ;
 
 PropertySelector_
     ;
 
 PropertySelector_

-    : PropertySelector
-    | "[" Expression "]"
+    : PropertySelector { $$ = $1; }
+    | "[" Expression "]" { $$ = new(driver.pool_) CYSelector($2); }

     ;
 
 PropertySelector
     ;
 
 PropertySelector

-    : Identifier { $$ = $1; }
+    : Identifier { $$ = new(driver.pool_) CYSelector($1); }

     | WildcardIdentifier { $$ = $1; }
     ;
 /* }}} */
 /* 11.1.2 Qualified Identifiers {{{ */
 QualifiedIdentifier_
     | WildcardIdentifier { $$ = $1; }
     ;
 /* }}} */
 /* 11.1.2 Qualified Identifiers {{{ */
 QualifiedIdentifier_

-    : PropertySelector_ { $$ = $1; }
+    : PropertySelector_ { $$ = new(driver.pool_) CYQualified(NULL, $1); }

     | QualifiedIdentifier { $$ = $1; }
     ;
 
 QualifiedIdentifier
     | QualifiedIdentifier { $$ = $1; }
     ;
 
 QualifiedIdentifier

-    : PropertySelector "::" PropertySelector_ { $$ = new(driver.pool_) CYQName($1, $3); }
+    : PropertySelector "::" PropertySelector_ { $$ = new(driver.pool_) CYQualified($1, $3); }

     ;
 /* }}} */
 /* 11.1.3 Wildcard Identifiers {{{ */
     ;
 /* }}} */
 /* 11.1.3 Wildcard Identifiers {{{ */


@@ -1840,13 +1853,13 @@ MemberAccess
     ;
 /* }}} */
 /* 12.1 The default xml namespace Statement {{{ */
     ;
 /* }}} */
 /* 12.1 The default xml namespace Statement {{{ */

-DefaultXMLNamespaceStatement
+/* XXX: DefaultXMLNamespaceStatement

     : "default" "xml" "namespace" "=" Expression Terminator { $$ = new(driver.pool_) CYDefaultXMLNamespace($5); }
     ;
 
 Statement_
     : DefaultXMLNamespaceStatement { $$ = $1; }
     : "default" "xml" "namespace" "=" Expression Terminator { $$ = new(driver.pool_) CYDefaultXMLNamespace($5); }
     ;
 
 Statement_
     : DefaultXMLNamespaceStatement { $$ = $1; }

-    ;
+    ; */

 /* }}} */
 @end
 
 /* }}} */
 @end
 

diff --git a/E4X/Syntax.hpp b/E4X/Syntax.hpp
index 921db0245ad59c526576485f6d511640f36eecdc..9bec64d99958656daa3c37c362d7c2cb6a81e3ae 100644 (file)
--- a/E4X/Syntax.hpp
+++ b/E4X/Syntax.hpp
@@ -56,4 +56,59 @@ struct CYDefaultXMLNamespace :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

+struct CYPropertyIdentifier {
+};
+
+struct CYSelector
+{
+};
+
+struct CYWildcard :
+    CYPropertyIdentifier,
+    CYSelector
+{
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYQualified :
+    CYPropertyIdentifier
+{
+    CYSelector *namespace_;
+    CYSelector *name_;
+
+    CYQualified(CYSelector *_namespace, CYSelector *name) :
+        namespace_(_namespace),
+        name_(name)
+    {
+    }
+};
+
+struct CYPropertyVariable :
+    CYExpression
+{
+    CYPropertyIdentifier *identifier_;
+
+    CYPropertyVariable(CYPropertyIdentifier *identifier) :
+        identifier_(identifier)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYAttribute :
+    CYPropertyIdentifier
+{
+    CYQualified *identifier_;
+
+    CYAttribute(CYQualified *identifier) :
+        identifier_(identifier)
+    {
+    }
+};
+

 #endif/*CYCRIPT_E4X_SYNTAX_HPP*/
 #endif/*CYCRIPT_E4X_SYNTAX_HPP*/

diff --git a/makefile b/makefile
index 18cea089b773917f2b169354a658758961edc79b..3e3006d38c48195127a655d8fb0088c213a14a86 100644 (file)
--- a/makefile
+++ b/makefile
@@ -26,7 +26,7 @@ code += Cycript.tab.o lex.cy.o
 code += Network.o Parser.o
 code += JavaScriptCore.o Library.o
 
 code += Network.o Parser.o
 code += JavaScriptCore.o Library.o
 

-filters := C #E4X
+filters := C E4X

 ldid := true
 dll := so
 apr := $(shell apr-1-config --link-ld)
 ldid := true
 dll := so
 apr := $(shell apr-1-config --link-ld)

diff --git a/todo.txt b/todo.txt
index 0528bbb023d3245a15c680c9a8d62d10a3980017..be2776aa0a1173fa49f135880fe983e20376eb33 100644 (file)
--- a/todo.txt
+++ b/todo.txt
@@ -6,4 +6,5 @@ look into what String is, and whether to bridge it
 the console frontend's error handling, well, doesn't
 setup a default hook mechanism for ffi_call passthrough
 some JS callbacks don't use exception pointers at all...
 the console frontend's error handling, well, doesn't
 setup a default hook mechanism for ffi_call passthrough
 some JS callbacks don't use exception pointers at all...

-PropertyName may need a LexSetRegExp before it
+a newline needs to not be allowed after a unary *
+finish implementing default xml namespace statement