- Add missing assignment operators.

- Add missing power ('**') operator.
- Add testcase to test them.

Author: GuillermoHernan

jsLexer.cpp

@@ -24,10 +24,14 @@ string getTokenStr(int token)
 {
     if (token > 32 && token < 128)
     {
-        char buf[4] = "' '";
-        buf[1] = (char) token;
+        char buf[2] = "x";
+        buf[0] = (char)token;
         return buf;
     }
+    else if (token > LEX_ASSIGN_BASE && token < LEX_R_WORDS_BASE)
+    {
+        return getTokenStr(token - LEX_ASSIGN_BASE) + "=";
+    }
     switch (token)
     {
     case LEX_EOF: return "EOF";
@@ -41,20 +45,14 @@ string getTokenStr(int token)
     case LEX_NTYPEEQUAL: return "!==";
     case LEX_LEQUAL: return "<=";
     case LEX_LSHIFT: return "<<";
-    case LEX_LSHIFTEQUAL: return "<<=";
     case LEX_GEQUAL: return ">=";
     case LEX_RSHIFT: return ">>";
     case LEX_RSHIFTUNSIGNED: return ">>";
-    case LEX_RSHIFTEQUAL: return ">>=";
-    case LEX_PLUSEQUAL: return "+=";
-    case LEX_MINUSEQUAL: return "-=";
     case LEX_PLUSPLUS: return "++";
     case LEX_MINUSMINUS: return "--";
-    case LEX_ANDEQUAL: return "&=";
     case LEX_ANDAND: return "&&";
-    case LEX_OREQUAL: return "|=";
     case LEX_OROR: return "||";
-    case LEX_XOREQUAL: return "^=";
+    case LEX_POWER: return "**";
         // reserved words
     case LEX_R_IF: return "if";
     case LEX_R_ELSE: return "else";
@@ -387,7 +385,7 @@ CScriptToken CScriptToken::parseString(const char * code)const
 struct SOperatorDef
 {
     const char * text;
-    const LEX_TYPES code;
+    const int code;
     const int len;
 };
 
@@ -396,26 +394,29 @@ struct SOperatorDef
  * before sorter ones.
  */
 const SOperatorDef s_operators [] = {
+    {">>>=", LEX_ASSIGN_BASE + LEX_RSHIFTUNSIGNED, 4},
     {"===", LEX_TYPEEQUAL, 3},
     {"!==", LEX_NTYPEEQUAL, 3},
-    {"<<=", LEX_LSHIFTEQUAL, 3},
-    {">>=", LEX_RSHIFTEQUAL, 3},
     {">>>", LEX_RSHIFTUNSIGNED, 3},
+    {"<<=", LEX_ASSIGN_BASE + LEX_LSHIFT, 3},
+    {">>=", LEX_ASSIGN_BASE + LEX_RSHIFT, 3},
+    {"**=", LEX_ASSIGN_BASE + LEX_POWER, 3},
     {"==", LEX_EQUAL, 2},
     {"!=", LEX_NEQUAL, 2},
     {"<=", LEX_LEQUAL, 2},
     {">=", LEX_GEQUAL, 2},
     {"<<", LEX_LSHIFT, 2},
     {">>", LEX_RSHIFT, 2},
-    {"+=", LEX_PLUSEQUAL, 2},
-    {"-=", LEX_MINUSEQUAL, 2},
-    //{"*=", , 2},
-    //{"/=", , 2},
-    //{"%&=", , 2},
-    {"&=", LEX_ANDEQUAL, 2},
-    {"|=", LEX_OREQUAL, 2},
+    {"**", LEX_POWER, 2},
+    {"+=", LEX_ASSIGN_BASE + '+', 2},
+    {"-=", LEX_ASSIGN_BASE + '-', 2},
+    {"*=", LEX_ASSIGN_BASE + '*', 2},
+    {"/=", LEX_ASSIGN_BASE + '/', 2},
+    {"%=", LEX_ASSIGN_BASE + '%', 2},
+    {"&=", LEX_ASSIGN_BASE + '&', 2},
+    {"|=", LEX_ASSIGN_BASE + '|', 2},
+    {"^=", LEX_ASSIGN_BASE + '^', 2},
     {"||", LEX_OROR, 2},
-    {"^=", LEX_XOREQUAL, 2},
     {"&&", LEX_ANDAND, 2},
     {"++", LEX_PLUSPLUS, 2},
     {"--", LEX_MINUSMINUS, 2},
@@ -433,7 +434,7 @@ CScriptToken CScriptToken::parseOperator(const char * code)const
     for (int i = 0; s_operators[i].len > 0; ++i)
     {
         if (strncmp(code, s_operators[i].text, s_operators[i].len) == 0)
-            return buildNextToken(s_operators[i].code, code, s_operators[i].len);
+            return buildNextToken((LEX_TYPES)s_operators[i].code, code, s_operators[i].len);
     }
 
     //Take it as a single char operator

jsLexer.h

@@ -15,15 +15,6 @@ enum LEX_TYPES
     LEX_EOF = 0,
     LEX_INITIAL,
     LEX_COMMENT,
-    LEX_ASSIGN_BASE = 128,
-
-    LEX_LSHIFTEQUAL,
-    LEX_RSHIFTEQUAL,
-    LEX_PLUSEQUAL = LEX_ASSIGN_BASE + '+',
-    LEX_MINUSEQUAL = LEX_ASSIGN_BASE + '-',
-    LEX_ANDEQUAL = LEX_ASSIGN_BASE + '&',
-    LEX_OREQUAL = LEX_ASSIGN_BASE + '|',
-    LEX_XOREQUAL = LEX_ASSIGN_BASE + '^',
 
     LEX_ID = 256,
     LEX_INT,
@@ -43,8 +34,21 @@ enum LEX_TYPES
     LEX_MINUSMINUS,
     LEX_ANDAND,
     LEX_OROR,
+    LEX_POWER,
+
+    LEX_ASSIGN_BASE = 512,
+
+//    LEX_PLUSEQUAL = LEX_ASSIGN_BASE + '+',
+//    LEX_MINUSEQUAL = LEX_ASSIGN_BASE + '-',
+//    LEX_ANDEQUAL = LEX_ASSIGN_BASE + '&',
+//    LEX_OREQUAL = LEX_ASSIGN_BASE + '|',
+//    LEX_XOREQUAL = LEX_ASSIGN_BASE + '^',
+//    LEX_LSHIFTEQUAL,
+//    LEX_RSHIFTEQUAL,
+    LEX_ASSIGN_MAX = 1023,
+    
     // reserved words
-#define LEX_R_LIST_START LEX_R_IF
+    LEX_R_WORDS_BASE = 1024,
     LEX_R_IF,
     LEX_R_ELSE,
     LEX_R_DO,
@@ -131,11 +135,6 @@ class CScriptToken
         return m_type;
     }
 
-    bool isAssignment()const
-    {
-        return m_type == '=' || (m_type > LEX_ASSIGN_BASE && m_type < LEX_ID);
-    }
-
     bool eof()const
     {
         return m_type == LEX_EOF;

jsParser.cpp

@@ -63,7 +63,7 @@ ExprResult parseBinaryRLOp (CScriptToken token, const int *types, ExprResult::Pa
 bool isAssignment(CScriptToken token)
 {
     const LEX_TYPES t = token.type();
-    return t == '=' || (t > LEX_ASSIGN_BASE && t < LEX_ID);
+    return t == '=' || (t > LEX_ASSIGN_BASE && t < LEX_ASSIGN_MAX);
 }
 
 bool oneOf (CScriptToken token, const char* chars)

microVM.cpp

@@ -307,7 +307,7 @@ void execCall (const int nArgs, ExecutionContext* ec)
     const Ref<JSValue>  fnVal = ec->pop();
 
     if (!fnVal->isFunction())
-        error ("Trying to call a non-funcion value");
+        error ("Trying to call a non-function value");
 
     const Ref<JSFunction>   function = fnVal.staticCast<JSFunction>();
 

mvmCodegen.cpp

@@ -656,8 +656,9 @@ void prefixOpCodegen(Ref<AstNode> statement, CodegenState* pState)
     {
         //It is translated into a '+=' or '-=' equivalent operation
         Ref<AstLiteral> l = AstLiteral::create(op->position(), 1);
+        const int       newOpCode = LEX_ASSIGN_BASE + (op->code == LEX_PLUSPLUS ? '+' : '-');
         Ref<AstNode>    newOp = astCreateAssignment(op->position(),
-                                                    op->code == LEX_PLUSPLUS ? LEX_PLUSEQUAL : LEX_MINUSEQUAL,
+                                                    newOpCode,
                                                     op->children()[0], 
                                                     l);
         codegen(newOp, pState);
@@ -952,6 +953,7 @@ void binaryOperatorCode (int tokenCode, CodegenState* pState)
         operators['*'] =                "@multiply";
         operators['/'] =                "@divide";
         operators['%'] =                "@modulus";
+        operators[LEX_POWER] =          "@power";
         operators['&'] =                "@binAnd";
         operators['|'] =                "@binOr";
         operators['^'] =                "@binXor";

mvmFunctions.cpp

@@ -140,6 +140,19 @@ Ref<JSValue> mvmModulus (FunctionScope* pScope)
     return jsDouble( fmod(valA, valB) );
 }
 
+/**
+ * Power operation
+ * @param pScope
+ * @return 
+ */
+Ref<JSValue> mvmPower (FunctionScope* pScope)
+{
+    const double valA = pScope->getThis()->toDouble();
+    const double valB = pScope->getParam("b")->toDouble();
+    
+    return jsDouble( pow(valA, valB) );
+}
+
 /**
  * Binary 'NOT' operation
  * @param pScope
@@ -419,6 +432,7 @@ void registerMvmFunctions(Ref<IScope> scope)
     addNative1("@multiply", "b", mvmMultiply, scope);
     addNative1("@divide", "b", mvmDivide, scope);
     addNative1("@modulus", "b", mvmModulus, scope);
+    addNative1("@power", "b", mvmPower, scope);
 
     addNative0("@binNot", mvmBinNot, scope);
     addNative1("@binAnd", "b", mvmBinAnd, scope);

tests/test039.js

@@ -0,0 +1,59 @@
+// Assignment operators test
+
+/*
+    Assignment                      x = y 	x = y
+    Addition assignment             x += y 	x = x + y
+    Subtraction assignment          x -= y 	x = x - y
+    Multiplication assignment       x *= y 	x = x * y
+    Division assignment             x /= y 	x = x / y
+    Remainder assignment            x %= y 	x = x % y
+    Exponentiation assignment       x **= y 	x = x ** y
+    Left shift assignment           x <<= y 	x = x << y
+    Right shift assignment          x >>= y 	x = x >> y
+    Unsigned right shift assignment x >>>= y 	x = x >>> y
+    Bitwise AND assignment          x &= y 	x = x & y
+    Bitwise XOR assignment          x ^= y 	x = x ^ y
+    Bitwise OR assignment           x |= y 	x = x | y
+ */
+
+var x = 1;
+
+assert (5 == (x+=4), "+= result");
+assert (5 == x, "+=");
+
+x -= 7;
+assert (-2 == x, "-=");
+
+x *= -12;
+assert (24 == x, "*=");
+
+x /= 6;
+assert (4 == x, "/=");
+
+x = 10;
+x %= 4;
+assert (2 == x, "%=");
+
+x **= 8;
+assert (256 == x, "**=");
+
+x <<= 2;
+assert (1024 == x, "<<=");
+
+x |= 0x1F;
+assert (0x41F == x, "|=");
+
+x ^= 0xff;
+assert (0x4E0 == x, "^=");
+
+x = -17;
+x >>= 1;
+assert (-9 == x, ">>=");
+
+x >>>= 22;
+assert (0x3FF == x, ">>>=");
+
+x &= 0x1019;
+assert (0x19 == x, "&=");
+
+result = 1;