Author: [EMAIL PROTECTED]
Date: Mon Dec 1 15:40:25 2008
New Revision: 4216
Modified:
changes/bobv/soyc-reports-r4205/dev/core/src/com/google/gwt/core/ext/soyc/MethodMember.java
changes/bobv/soyc-reports-r4205/dev/core/src/com/google/gwt/dev/cfg/ModuleDefLoader.java
changes/bobv/soyc-reports-r4205/dev/core/src/com/google/gwt/dev/js/ast/JsNameRef.java
changes/bobv/soyc-reports-r4205/dev/core/src/com/google/gwt/dev/js/ast/JsProgram.java
Log:
Misc code cleanups.
Suggested by: kprobst
Modified:
changes/bobv/soyc-reports-r4205/dev/core/src/com/google/gwt/core/ext/soyc/MethodMember.java
==============================================================================
---
changes/bobv/soyc-reports-r4205/dev/core/src/com/google/gwt/core/ext/soyc/MethodMember.java
(original)
+++
changes/bobv/soyc-reports-r4205/dev/core/src/com/google/gwt/core/ext/soyc/MethodMember.java
Mon Dec 1 15:40:25 2008
@@ -19,7 +19,7 @@
package com.google.gwt.core.ext.soyc;
/**
- * Represents a Java method in the compiled output.
+ * Represents compiled JS code derived from a Java method.
*/
public interface MethodMember extends HasAliases, HasDependencies,
HasEnclosing, HasOverrides<MethodMember>, Member {
Modified:
changes/bobv/soyc-reports-r4205/dev/core/src/com/google/gwt/dev/cfg/ModuleDefLoader.java
==============================================================================
---
changes/bobv/soyc-reports-r4205/dev/core/src/com/google/gwt/dev/cfg/ModuleDefLoader.java
(original)
+++
changes/bobv/soyc-reports-r4205/dev/core/src/com/google/gwt/dev/cfg/ModuleDefLoader.java
Mon Dec 1 15:40:25 2008
@@ -242,7 +242,7 @@
moduleDir, moduleDef);
ReflectiveParser.parse(logger, schema, r);
} catch (Throwable e) {
- e.printStackTrace();
+ logger.log(TreeLogger.ERROR, "Unexpected error while processing
XML", e);
} finally {
Utility.close(r);
}
Modified:
changes/bobv/soyc-reports-r4205/dev/core/src/com/google/gwt/dev/js/ast/JsNameRef.java
==============================================================================
---
changes/bobv/soyc-reports-r4205/dev/core/src/com/google/gwt/dev/js/ast/JsNameRef.java
(original)
+++
changes/bobv/soyc-reports-r4205/dev/core/src/com/google/gwt/dev/js/ast/JsNameRef.java
Mon Dec 1 15:40:25 2008
@@ -137,7 +137,6 @@
JsNode<?> staticRef = name.getStaticRef();
if (staticRef != null) {
toReturn.copyMissingCorrelationsFrom(name.getStaticRef().getSourceInfo());
- //
toReturn.addAdditonalAncestors(name.getStaticRef().getSourceInfo());
hasStaticRef = true;
}
}
Modified:
changes/bobv/soyc-reports-r4205/dev/core/src/com/google/gwt/dev/js/ast/JsProgram.java
==============================================================================
---
changes/bobv/soyc-reports-r4205/dev/core/src/com/google/gwt/dev/js/ast/JsProgram.java
(original)
+++
changes/bobv/soyc-reports-r4205/dev/core/src/com/google/gwt/dev/js/ast/JsProgram.java
Mon Dec 1 15:40:25 2008
@@ -17,6 +17,7 @@
import com.google.gwt.dev.jjs.Correlation;
import com.google.gwt.dev.jjs.SourceInfo;
+import com.google.gwt.dev.jjs.Correlation.Axis;
import com.google.gwt.dev.jjs.Correlation.Literal;
import java.util.HashMap;
@@ -73,15 +74,15 @@
/**
* Constructs a JavaScript program object.
*
- * @param enableSourceInfoDescendants Controls whether or not SourceInfo
nodes
- * created via the JsProgram will record descendant information.
- * Enabling this feature will collect extra data during the
- * compilation cycle, but at a cost of memory and object
allocations.
+ * @param soycEnabled Controls whether or not SourceInfo nodes created
via the
+ * JsProgram will record descendant information. Enabling this
+ * feature will collect extra data during the compilation
cycle, but
+ * at a cost of memory and object allocations.
*/
- public JsProgram(boolean enableSourceInfoDescendants) {
+ public JsProgram(boolean soycEnabled) {
super(SourceInfoJs.INTRINSIC.makeChild(JsProgram.class,
"JavaScript program"));
- this.enableSourceInfoDescendants = enableSourceInfoDescendants;
+ this.enableSourceInfoDescendants = soycEnabled;
rootScope = new JsRootScope(this);
topScope = new JsScope(rootScope, "Global");
@@ -176,6 +177,12 @@
return lit;
} else {
+ // Only add a JS_NUMBER if no literal correlation present: e.g. Java
int
+ if (info.getPrimaryCorrelation(Axis.LITERAL) == null) {
+ // Don't mutate incoming SourceInfo
+ info = info.makeChild(JsProgram.class, "Number literal " + value);
+ info.addCorrelation(Correlation.by(Literal.JS_NUMBER));
+ }
return new JsNumberLiteral(info, value);
}
}
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
