compiler/java/com/google/dart/compiler/resolver/CompileTimeConstVisitor.java - Issue 8395013: DartC User Warning Framework

Unified Diff: compiler/java/com/google/dart/compiler/resolver/CompileTimeConstVisitor.java

Issue 8395013: DartC User Warning Framework (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Use new ErrorCode enums in single onError() method. Created 9 years, 2 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

« no previous file with comments | « compiler/java/com/google/dart/compiler/parser/ParserErrorCode.java ('k') | compiler/java/com/google/dart/compiler/resolver/CoreTypeProviderImplementation.java » ('j') | compiler/java/com/google/dart/runner/DartRunner.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: compiler/java/com/google/dart/compiler/resolver/CompileTimeConstVisitor.java

diff --git a/compiler/java/com/google/dart/compiler/resolver/CompileTimeConstVisitor.java b/compiler/java/com/google/dart/compiler/resolver/CompileTimeConstVisitor.java

index 2f328d62150cc47d11d69e5dfa26ec3419e80af8..a5e3dba613890d963cd49a99c4120e0a2dfc161a 100644

--- a/compiler/java/com/google/dart/compiler/resolver/CompileTimeConstVisitor.java

+++ b/compiler/java/com/google/dart/compiler/resolver/CompileTimeConstVisitor.java

@@ -4,7 +4,6 @@

package com.google.dart.compiler.resolver;

-import com.google.dart.compiler.DartCompilerErrorCode;

import com.google.dart.compiler.InternalCompilerException;

import com.google.dart.compiler.ast.DartArrayLiteral;

import com.google.dart.compiler.ast.DartBinaryExpression;

@@ -65,7 +64,7 @@ public class CompileTimeConstVisitor extends DartNodeTraverser<Void> {

private boolean checkBoolean(DartNode x, Type type) {

if (!type.equals(boolType)) {

- context.resolutionError(x, DartCompilerErrorCode.EXPECTED_CONSTANT_EXPRESSION_BOOLEAN,

+ context.onError(x, ResolverErrorCode.EXPECTED_CONSTANT_EXPRESSION_BOOLEAN,

type.toString());

return false;

}

@@ -74,7 +73,7 @@ public class CompileTimeConstVisitor extends DartNodeTraverser<Void> {

private boolean checkInt(DartNode x, Type type) {

if (!type.equals(intType)) {

- context.resolutionError(x, DartCompilerErrorCode.EXPECTED_CONSTANT_EXPRESSION_INT,

+ context.onError(x, ResolverErrorCode.EXPECTED_CONSTANT_EXPRESSION_INT,

type.toString());

return false;

}

@@ -83,7 +82,7 @@ public class CompileTimeConstVisitor extends DartNodeTraverser<Void> {

private boolean checkNumber(DartNode x, Type type) {

if (!(type.equals(numType) || type.equals(intType) || type.equals(doubleType))) {

- context.resolutionError(x, DartCompilerErrorCode.EXPECTED_CONSTANT_EXPRESSION_NUMBER,

+ context.onError(x, ResolverErrorCode.EXPECTED_CONSTANT_EXPRESSION_NUMBER,

type.toString());

return false;

}

@@ -93,8 +92,8 @@ public class CompileTimeConstVisitor extends DartNodeTraverser<Void> {

private boolean checkNumberBooleanOrStringType(DartNode x, Type type) {

if (!type.equals(intType) && !type.equals(boolType)

&& !type.equals(numType) && !type.equals(doubleType) && !type.equals(stringType)) {

- context.resolutionError(x,

- DartCompilerErrorCode.EXPECTED_CONSTANT_EXPRESSION_STRING_NUMBER_BOOL,

+ context.onError(x,

+ ResolverErrorCode.EXPECTED_CONSTANT_EXPRESSION_STRING_NUMBER_BOOL,

type.toString());

return false;

}

@@ -304,7 +303,7 @@ public class CompileTimeConstVisitor extends DartNodeTraverser<Void> {

default:

throw new InternalCompilerException("Unexpected element " + x.toString()

+ " kind: " + ElementKind.of(element)

- + "evaluating type for compile-time constant expression.");

+ + " evaluating type for compile-time constant expression.");

}

return null;

}

@@ -364,7 +363,7 @@ public class CompileTimeConstVisitor extends DartNodeTraverser<Void> {

* specific error message when possible.

private void expectedConstant(DartNode x) {

- context.resolutionError(x, DartCompilerErrorCode.EXPECTED_CONSTANT_EXPRESSION);

+ context.onError(x, ResolverErrorCode.EXPECTED_CONSTANT_EXPRESSION);

}

/**