Implement internal multiply (for the compiler).

diff --git a/Parser.hpp b/Parser.hpp
index 0e4b51f824d6653e2d801a2a7423579092c48c9e..59e657fa17ecc7241c5f75ea22d2c8472e0cb9fc 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -2043,7 +2043,7 @@ CYPrefix_(false, "-", Negate)
 CYPrefix_(false, "~", BitwiseNot)
 CYPrefix_(false, "!", LogicalNot)
 
 CYPrefix_(false, "~", BitwiseNot)
 CYPrefix_(false, "!", LogicalNot)
 

-CYInfix_(false, 5, "*", Multiply)
+CYInfix_(false, 5, "*", Multiply, CYReplace)

 CYInfix_(false, 5, "/", Divide)
 CYInfix_(false, 5, "%", Modulus)
 CYInfix_(false, 6, "+", Add, CYReplace)
 CYInfix_(false, 5, "/", Divide)
 CYInfix_(false, 5, "%", Modulus)
 CYInfix_(false, 6, "+", Add, CYReplace)

diff --git a/Replace.cpp b/Replace.cpp
index 83a5c47328840c8238115c6908ac47563dafa51b..f5779191689ce3ec9a8b680d292018a943f0c290 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -533,6 +533,19 @@ CYStatement *CYLetStatement::Replace(CYContext &context) {
     return $E($ CYCall(CYNonLocalize(context, $ CYFunctionExpression(NULL, declarations_->Parameter(context), code_)), declarations_->Argument(context)));
 }
 
     return $E($ CYCall(CYNonLocalize(context, $ CYFunctionExpression(NULL, declarations_->Parameter(context), code_)), declarations_->Argument(context)));
 }
 

+CYExpression *CYMultiply::Replace(CYContext &context) {
+    CYInfix::Replace(context);
+
+    CYExpression *lhp(lhs_->Primitive(context));
+    CYExpression *rhp(rhs_->Primitive(context));
+
+    if (CYNumber *lhn = lhp->Number(context))
+        if (CYNumber *rhn = rhp->Number(context))
+            return $D(lhn->Value() * rhn->Value());
+
+    return this;
+}
+

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