Parse scope and symbol colon operators, from Ruby.

[cycript.git] / Syntax.hpp

diff --git a/Syntax.hpp b/Syntax.hpp
index d7d783bc3ecc1eca07dd1bdd71b24168c1bc397b..a3f03fab47eaca021196368cdc7cd29e965986ed 100644 (file)
--- a/Syntax.hpp
+++ b/Syntax.hpp
@@ -33,6 +33,18 @@
 #include "Location.hpp"
 #include "Options.hpp"
 #include "Pooling.hpp"
 #include "Location.hpp"
 #include "Options.hpp"
 #include "Pooling.hpp"

+#include "String.hpp"
+
+double CYCastDouble(const char *value, size_t size);
+double CYCastDouble(const char *value);
+double CYCastDouble(CYUTF8String value);
+
+void CYNumerify(std::ostringstream &str, double value);
+void CYStringify(std::ostringstream &str, const char *data, size_t size, bool c = false);
+
+// XXX: this really should not be here ... :/
+void *CYPoolFile(CYPool &pool, const char *path, size_t *psize);
+CYUTF8String CYPoolFileUTF8String(CYPool &pool, const char *path);

 
 struct CYContext;
 
 
 struct CYContext;
 


@@ -138,6 +150,7 @@ enum CYFlags {
     CYNoRightHand =  (1 << 5),
     CYNoDangle =     (1 << 6),
     CYNoInteger =    (1 << 7),
     CYNoRightHand =  (1 << 5),
     CYNoDangle =     (1 << 6),
     CYNoInteger =    (1 << 7),

+    CYNoColon =      (1 << 8),

     CYNoBFC =        (CYNoBrace | CYNoFunction | CYNoClass),
 };
 
     CYNoBFC =        (CYNoBrace | CYNoFunction | CYNoClass),
 };
 


@@ -950,6 +963,22 @@ struct CYVariable :
     virtual CYFunctionParameter *Parameter() const;
 };
 
     virtual CYFunctionParameter *Parameter() const;
 };
 

+struct CYSymbol :
+    CYTarget
+{
+    const char *name_;
+
+    CYSymbol(const char *name) :
+        name_(name)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual CYTarget *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+

 struct CYPrefix :
     CYExpression
 {
 struct CYPrefix :
     CYExpression
 {


@@ -1077,21 +1106,26 @@ struct CYClause :
 };
 
 struct CYElement :
 };
 
 struct CYElement :

+    CYNext<CYElement>,

     CYThing
 {
     CYThing
 {

+    CYElement(CYElement *next) :
+        CYNext<CYElement>(next)
+    {
+    }
+

     virtual bool Elision() const = 0;
 
     virtual void Replace(CYContext &context) = 0;
 };
 
 struct CYElementValue :
     virtual bool Elision() const = 0;
 
     virtual void Replace(CYContext &context) = 0;
 };
 
 struct CYElementValue :

-    CYNext<CYElement>,

     CYElement
 {
     CYExpression *value_;
 
     CYElement
 {
     CYExpression *value_;
 

-    CYElementValue(CYExpression *value, CYElement *next) :
-        CYNext<CYElement>(next),
+    CYElementValue(CYExpression *value, CYElement *next = NULL) :
+        CYElement(next),

         value_(value)
     {
     }
         value_(value)
     {
     }


@@ -1109,7 +1143,8 @@ struct CYElementSpread :
 {
     CYExpression *value_;
 
 {
     CYExpression *value_;
 

-    CYElementSpread(CYExpression *value) :
+    CYElementSpread(CYExpression *value, CYElement *next = NULL) :
+        CYElement(next),

         value_(value)
     {
     }
         value_(value)
     {
     }


@@ -1430,6 +1465,20 @@ struct CYIndirectMember :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

+struct CYResolveMember :
+    CYMember
+{
+    CYResolveMember(CYExpression *object, CYExpression *property) :
+        CYMember(object, property)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYTarget *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+

 namespace cy {
 namespace Syntax {
 
 namespace cy {
 namespace Syntax {
 


@@ -1951,70 +2000,87 @@ struct CYTypeError :
     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 

-struct CYTypeVoid :
+enum CYTypeSigning {
+    CYTypeNeutral,
+    CYTypeSigned,
+    CYTypeUnsigned,
+};
+
+struct CYTypeCharacter :

     CYTypeSpecifier
 {
     CYTypeSpecifier
 {

-    CYTypeVoid() {
+    CYTypeSigning signing_;
+
+    CYTypeCharacter(CYTypeSigning signing) :
+        signing_(signing)
+    {

     }
 
     virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 
     }
 
     virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 

-struct CYTypeVariable :
+struct CYTypeIntegral :

     CYTypeSpecifier
 {
     CYTypeSpecifier
 {

-    CYIdentifier *name_;
+    CYTypeSigning signing_;
+    int length_;

 
 

-    CYTypeVariable(CYIdentifier *name) :
-        name_(name)
+    CYTypeIntegral(CYTypeSigning signing, int length = 1) :
+        signing_(signing),
+        length_(length)

     {
     }
 
     {
     }
 

-    CYTypeVariable(const char *name) :
-        name_(new($pool) CYIdentifier(name))
-    {
+    CYTypeIntegral *Long() {
+        if (length_ != 1 && length_ != 2)
+            return NULL;
+        ++length_;
+        return this;

     }
 
     }
 

-    virtual CYTarget *Replace(CYContext &context);
-    virtual void Output(CYOutput &out) const;
-};
+    CYTypeIntegral *Short() {
+        if (length_ != 1)
+            return NULL;
+        --length_;
+        return this;
+    }

 
 

-struct CYTypeUnsigned :
-    CYTypeSpecifier
-{
-    CYTypeSpecifier *specifier_;
+    CYTypeIntegral *Signed() {
+        if (signing_ != CYTypeNeutral)
+            return NULL;
+        signing_ = CYTypeSigned;
+        return this;
+    }

 
 

-    CYTypeUnsigned(CYTypeSpecifier *specifier) :
-        specifier_(specifier)
-    {
+    CYTypeIntegral *Unsigned() {
+        if (signing_ != CYTypeNeutral)
+            return NULL;
+        signing_ = CYTypeUnsigned;
+        return this;

     }
 
     virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 
     }
 
     virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 

-struct CYTypeSigned :
+struct CYTypeVoid :

     CYTypeSpecifier
 {
     CYTypeSpecifier
 {

-    CYTypeSpecifier *specifier_;
-
-    CYTypeSigned(CYTypeSpecifier *specifier) :
-        specifier_(specifier)
-    {
+    CYTypeVoid() {

     }
 
     virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 
     }
 
     virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 

-struct CYTypeLong :
+struct CYTypeReference :

     CYTypeSpecifier
 {
     CYTypeSpecifier
 {

-    CYTypeSpecifier *specifier_;
+    CYIdentifier *name_;

 
 

-    CYTypeLong(CYTypeSpecifier *specifier) :
-        specifier_(specifier)
+    CYTypeReference(CYIdentifier *name) :
+        name_(name)

     {
     }
 
     {
     }
 


@@ -2022,13 +2088,18 @@ struct CYTypeLong :
     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 

-struct CYTypeShort :
+struct CYTypeVariable :

     CYTypeSpecifier
 {
     CYTypeSpecifier
 {

-    CYTypeSpecifier *specifier_;
+    CYIdentifier *name_;
+
+    CYTypeVariable(CYIdentifier *name) :
+        name_(name)
+    {
+    }

 
 

-    CYTypeShort(CYTypeSpecifier *specifier) :
-        specifier_(specifier)
+    CYTypeVariable(const char *name) :
+        name_(new($pool) CYIdentifier(name))

     {
     }
 
     {
     }
 


@@ -2186,6 +2257,17 @@ struct CYTypedParameter :
     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 

+struct CYTypedFormal {
+    bool variadic_;
+    CYTypedParameter *parameters_;
+
+    CYTypedFormal(bool variadic) :
+        variadic_(variadic),
+        parameters_(NULL)
+    {
+    }
+};
+

 struct CYLambda :
     CYTarget
 {
 struct CYLambda :
     CYTarget
 {


@@ -2238,6 +2320,39 @@ struct CYImport :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

+struct CYImportSpecifier :
+    CYNext<CYImportSpecifier>
+{
+    CYWord *name_;
+    CYIdentifier *binding_;
+
+    CYImportSpecifier(CYWord *name, CYIdentifier *binding) :
+        name_(name),
+        binding_(binding)
+    {
+    }
+
+    CYStatement *Replace(CYContext &context, CYIdentifier *module);
+};
+
+struct CYImportDeclaration :
+    CYStatement
+{
+    CYImportSpecifier *specifiers_;
+    CYString *module_;
+
+    CYImportDeclaration(CYImportSpecifier *specifiers, CYString *module) :
+        specifiers_(specifiers),
+        module_(module)
+    {
+    }
+
+    CYCompact(None)
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+

 struct CYExternal :
     CYStatement
 {
 struct CYExternal :
     CYStatement
 {


@@ -2256,6 +2371,22 @@ struct CYExternal :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

+struct CYTypeExpression :
+    CYTarget
+{
+    CYTypedIdentifier *typed_;
+
+    CYTypeExpression(CYTypedIdentifier *typed) :
+        typed_(typed)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual CYTarget *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+

 struct CYTypeDefinition :
     CYStatement
 {
 struct CYTypeDefinition :
     CYStatement
 {


@@ -2292,10 +2423,12 @@ struct CYTypeBlockWith :
 struct CYTypeFunctionWith :
     CYTypeModifier
 {
 struct CYTypeFunctionWith :
     CYTypeModifier
 {

+    bool variadic_;

     CYTypedParameter *parameters_;
 
     CYTypedParameter *parameters_;
 

-    CYTypeFunctionWith(CYTypedParameter *parameters, CYTypeModifier *next = NULL) :
+    CYTypeFunctionWith(bool variadic, CYTypedParameter *parameters, CYTypeModifier *next = NULL) :

         CYTypeModifier(next),
         CYTypeModifier(next),

+        variadic_(variadic),

         parameters_(parameters)
     {
     }
         parameters_(parameters)
     {
     }


@@ -2308,6 +2441,66 @@ struct CYTypeFunctionWith :
     virtual CYTypeFunctionWith *Function() { return this; }
 };
 
     virtual CYTypeFunctionWith *Function() { return this; }
 };
 

+struct CYTypeStructField :
+    CYNext<CYTypeStructField>
+{
+    CYTypedIdentifier *typed_;
+
+    CYTypeStructField(CYTypedIdentifier *typed, CYTypeStructField *next = NULL) :
+        CYNext<CYTypeStructField>(next),
+        typed_(typed)
+    {
+    }
+};
+
+struct CYStructTail :
+    CYThing
+{
+    CYTypeStructField *fields_;
+
+    CYStructTail(CYTypeStructField *fields) :
+        fields_(fields)
+    {
+    }
+
+    CYTarget *Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYTypeStruct :
+    CYTypeSpecifier
+{
+    CYIdentifier *name_;
+    CYStructTail *tail_;
+
+    CYTypeStruct(CYIdentifier *name, CYStructTail *tail) :
+        name_(name),
+        tail_(tail)
+    {
+    }
+
+    virtual CYTarget *Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYStructDefinition :
+    CYStatement
+{
+    CYIdentifier *name_;
+    CYStructTail *tail_;
+
+    CYStructDefinition(CYIdentifier *name, CYStructTail *tail) :
+        name_(name),
+        tail_(tail)
+    {
+    }
+
+    CYCompact(None)
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+

 namespace cy {
 namespace Syntax {
 
 namespace cy {
 namespace Syntax {