editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/object/InstanceState.java - Issue 589043003: Backout constant support

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/object/InstanceState.java

Issue 589043003: Backout constant support (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/constant/ConstantVisitor.java ('K') | « editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/constant/ConstantVisitor.java ('k') | editor/tools/plugins/com.google.dart.engine_test/src/com/google/dart/engine/constant/ConstantEvaluatorTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/object/InstanceState.java

diff --git a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/object/InstanceState.java b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/object/InstanceState.java

index 6e21041afd76d2e4f40138bb9607a83fcffdad5b..c0bfbd31253afc2cfa0b2ddc41705c9e080adf3e 100644

--- a/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/object/InstanceState.java

+++ b/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/object/InstanceState.java

@@ -30,9 +30,10 @@ public abstract class InstanceState {

* @throws EvaluationException if the operator is not appropriate for an object of this kind

public InstanceState add(InstanceState rightOperand) throws EvaluationException {

- if (this instanceof StringState || rightOperand instanceof StringState) {

- return concatenate(rightOperand);

- }

+ // TODO(brianwilkerson) Uncomment the code below when the new constant support can be added.

+// if (this instanceof StringState || rightOperand instanceof StringState) {

+// return concatenate(rightOperand);

+// }

assertNumOrNull(this);

assertNumOrNull(rightOperand);

throw new EvaluationException(CompileTimeErrorCode.INVALID_CONSTANT);