libdeng2|Script: Implemented missing AND and OR operators

Oops.
skyjake · Dec 8, 2012 · 61afbeb · 61afbeb
1 parent 28749ba
commit 61afbeb
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 2 deletions.
diff --git a/doomsday/libdeng2/include/de/scriptsys/operator.h b/doomsday/libdeng2/include/de/scriptsys/operator.h
@@ -58,7 +58,9 @@ namespace de
         DICTIONARY,
         INDEX,
         SLICE,
-        PARENTHESIS
+        PARENTHESIS,
+        AND,
+        OR
     };
 
     String operatorToText(Operator op);

diff --git a/doomsday/libdeng2/src/scriptsys/operator.cpp b/doomsday/libdeng2/src/scriptsys/operator.cpp
@@ -28,6 +28,10 @@ String de::operatorToText(Operator op)
     {
     case NOT:
         return "NOT";
+    case AND:
+        return "AND";
+    case OR:
+        return "OR";
     case IN:
         return "IN";
     case EQUAL:

diff --git a/doomsday/libdeng2/src/scriptsys/operatorexpression.cpp b/doomsday/libdeng2/src/scriptsys/operatorexpression.cpp
@@ -172,6 +172,14 @@ Value *OperatorExpression::evaluate(Evaluator &evaluator) const
             result = newBooleanValue(rightValue->isFalse());
             break;
 
+        case AND:
+            result = newBooleanValue(leftValue->isTrue() && rightValue->isTrue());
+            break;
+
+        case OR:
+            result = newBooleanValue(leftValue->isTrue() || rightValue->isTrue());
+            break;
+
         case EQUAL:
             result = newBooleanValue(!leftValue->compare(*rightValue));
             break;
@@ -238,7 +246,8 @@ Value *OperatorExpression::evaluate(Evaluator &evaluator) const
             if(!recValue)
             {
                 throw ScopeError("OperatorExpression::evaluate",
-                    "Left side of " + operatorToText(_op) + " must evaluate to a record");
+                    "Left side of " + operatorToText(_op) + " must evaluate to a record [" +
+                                 DENG2_TYPE_NAME(*leftValue) + "]");
             }
 
             // Now that we know what the scope is, push the rest of the expression

diff --git a/doomsday/libdeng2/src/scriptsys/parser.cpp b/doomsday/libdeng2/src/scriptsys/parser.cpp
@@ -556,6 +556,9 @@ Expression *Parser::parseConditionalCompound(Compound &compound, CompoundFlags c
     auto_ptr<Expression> condition;
     if(flags.testFlag(HasCondition))
     {
+        LOG_AS("parseConditionalCompound");
+        LOG_DEV_TRACE("colon at %i", colon);
+
         TokenRange conditionRange = range.between(1, colon);
         if(conditionRange.empty())
         {
@@ -614,6 +617,9 @@ ArrayExpression *Parser::parseList(TokenRange const &range, QChar const *separat
 Expression *Parser::parseExpression(TokenRange const &fullRange, Expression::Flags const &flags)
 {
     TokenRange range = fullRange;
+
+    LOG_AS("parseExpression");
+    LOG_DEV_TRACE("", range.asText());
 
     if(!range.size())
     {
@@ -953,6 +959,8 @@ Operator Parser::findLowestOperator(TokenRange const &range, TokenRange &leftSid
                 { "*=",     MULTIPLY_ASSIGN,    0,          RIGHT_TO_LEFT },
                 { "/=",     DIVIDE_ASSIGN,      0,          RIGHT_TO_LEFT },
                 { "%=",     MODULO_ASSIGN,      0,          RIGHT_TO_LEFT },
+                { "or",     OR,                 1,          LEFT_TO_RIGHT },
+                { "and",    AND,                2,          LEFT_TO_RIGHT },
                 { "not",    NOT,                3,          RIGHT_TO_LEFT },
                 { "in",     IN,                 4,          LEFT_TO_RIGHT },
                 { "==",     EQUAL,              5,          LEFT_TO_RIGHT },

diff --git a/doomsday/tests/script/kitchen_sink.de b/doomsday/tests/script/kitchen_sink.de
@@ -139,6 +139,14 @@ print not True
 print not False
 print not 'Is this true?'
 
+sections.subsection('Operators: and/or.')
+print True and True
+print True and False
+print True or True
+print True or False
+print False or False
+print "'and' has higher preference than 'or':", True and False or True
+
 sections.subsection('Operators: comparisons.')
 print 'Numbers:', 1 > 3, 1 < 3, 2 >= 2, 4 >= 2, 2 <= 2, 4 <= 2
 print 'Text:', "hello" > "world", "hello" < "world", 'hello' == 'hello'