Browse Source

Localized code cleanup

Sebastien Ros 9 years ago
parent
commit
8b6d1793d3
2 changed files with 7 additions and 4 deletions
  1. 6 3
      Jint/Runtime/ExpressionIntepreter.cs
  2. 1 1
      Jint/Runtime/References/Reference.cs

+ 6 - 3
Jint/Runtime/ExpressionIntepreter.cs

@@ -194,10 +194,13 @@ namespace Jint.Runtime
 
 
         public JsValue EvaluateBinaryExpression(BinaryExpression expression)
         public JsValue EvaluateBinaryExpression(BinaryExpression expression)
         {
         {
-            JsValue left = _engine.GetValue(EvaluateExpression(expression.Left));
-            JsValue right = _engine.GetValue(EvaluateExpression(expression.Right));
-            JsValue value;
+            var leftExpression = EvaluateExpression(expression.Left);
+            JsValue left = _engine.GetValue(leftExpression);
+
+            var rightExpression = EvaluateExpression(expression.Right);
+            JsValue right = _engine.GetValue(rightExpression);
 
 
+            JsValue value;
               
               
             switch (expression.Operator)
             switch (expression.Operator)
             {
             {

+ 1 - 1
Jint/Runtime/References/Reference.cs

@@ -48,7 +48,7 @@ namespace Jint.Runtime.References
         public bool IsPropertyReference()
         public bool IsPropertyReference()
         {
         {
             // http://www.ecma-international.org/ecma-262/5.1/#sec-8.7
             // http://www.ecma-international.org/ecma-262/5.1/#sec-8.7
-            return (_baseValue.IsObject() && _baseValue.TryCast<EnvironmentRecord>() == null) || HasPrimitiveBase();
+            return (_baseValue.IsObject() && !_baseValue.Is<EnvironmentRecord>()) || HasPrimitiveBase();
         }
         }
     }
     }
 }
 }