[jboss-svn-commits] JBL Code SVN: r29329 - in labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman: rule/expression and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 14 06:38:56 EDT 2009
Author: adinn
Date: 2009-09-14 06:38:56 -0400 (Mon, 14 Sep 2009)
New Revision: 29329
Modified:
labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/Transformer.java
labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/expression/StringLiteral.java
labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ECAGrammarParser.java
labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ECATokenLexer.java
labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ParseNode.java
labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/sym.java
Log:
More improvements to error messages -- fixes for BYTEMAN-3
Modified: labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/Transformer.java
===================================================================
--- labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/Transformer.java 2009-09-14 10:34:21 UTC (rev 29328)
+++ labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/agent/Transformer.java 2009-09-14 10:38:56 UTC (rev 29329)
@@ -243,9 +243,6 @@
List<Class<?>> omitted = new LinkedList<Class<?>>();
Class<?>[] loaded = inst.getAllLoadedClasses();
- if (isVerbose()) {
- System.out.println("loaded classes size = " + loaded.length);
- }
for (Class clazz : loaded) {
String name = clazz.getName();
@@ -264,12 +261,11 @@
List<RuleScript> scripts = targetToScriptMap.get(name);
if (scripts != null) {
for (RuleScript script : scripts) {
- System.out.println("Checking script " + script.getName());
if (!script.hasTransform(clazz)) {
omitted.add(clazz);
found = true;
if (isVerbose()) {
- System.out.println("Found script for bootstrap class " + clazz.getName());
+ System.out.println("Retransforming loaded bootstrap class " + clazz.getName());
}
break;
}
@@ -279,12 +275,11 @@
scripts = targetToScriptMap.get(name.substring(lastDot + 1));
if (scripts != null) {
for (RuleScript script : scripts) {
- System.out.println("Checking script " + script.getName());
if (!script.hasTransform(clazz)) {
omitted.add(clazz);
found = true;
if (isVerbose()) {
- System.out.println("Found script for bootstrap class " + clazz.getName());
+ System.out.println("Retransforming loaded bootstrap class " + clazz.getName());
}
break;
}
@@ -511,9 +506,6 @@
}
if (isVerbose()) {
System.out.println("org.jboss.byteman.agent.Transformer : Inserting trigger event");
- System.out.println(" class " + handlerClass);
- System.out.println(" method " + handlerMethod);
- System.out.println(" " + handlerLocation);
}
final Rule rule;
String ruleName = ruleScript.getName();
Modified: labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/expression/StringLiteral.java
===================================================================
--- labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/expression/StringLiteral.java 2009-09-14 10:34:21 UTC (rev 29328)
+++ labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/expression/StringLiteral.java 2009-09-14 10:38:56 UTC (rev 29329)
@@ -43,8 +43,9 @@
public StringLiteral(Rule rule, ParseNode token)
{
super(rule, Type.STRING, token);
+ String string = ((String)token.getChild(0));
- this.text = token.getText().intern();
+ this.text = string.intern();
}
/**
Modified: labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ECAGrammarParser.java
===================================================================
--- labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ECAGrammarParser.java 2009-09-14 10:34:21 UTC (rev 29328)
+++ labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ECAGrammarParser.java 2009-09-14 10:38:56 UTC (rev 29329)
@@ -1,7 +1,7 @@
//----------------------------------------------------
// The following code was generated by CUP v0.10k
-// Mon Sep 14 10:26:17 BST 2009
+// Mon Sep 14 11:28:55 BST 2009
//----------------------------------------------------
package org.jboss.byteman.rule.grammar;
@@ -10,7 +10,7 @@
import org.jboss.byteman.rule.grammar.ParseNode;
/** CUP v0.10k generated parser.
- * @version Mon Sep 14 10:26:17 BST 2009
+ * @version Mon Sep 14 11:28:55 BST 2009
*/
public class ECAGrammarParser extends java_cup.runtime.lr_parser {
Modified: labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ECATokenLexer.java
===================================================================
--- labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ECATokenLexer.java 2009-09-14 10:34:21 UTC (rev 29328)
+++ labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ECATokenLexer.java 2009-09-14 10:38:56 UTC (rev 29329)
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.2 on 9/14/09 10:26 AM */
+/* The following code was generated by JFlex 1.4.2 on 9/14/09 11:28 AM */
/*
* JBoss, Home of Professional Open Source
@@ -33,7 +33,7 @@
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.4.2
- * on 9/14/09 10:26 AM from the specification file
+ * on 9/14/09 11:28 AM from the specification file
* <tt>dd/grammar/flex/ECAToken.flex</tt>
*/
public class ECATokenLexer implements java_cup.runtime.Scanner {
Modified: labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ParseNode.java
===================================================================
--- labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ParseNode.java 2009-09-14 10:34:21 UTC (rev 29328)
+++ labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/ParseNode.java 2009-09-14 10:38:56 UTC (rev 29329)
@@ -342,7 +342,7 @@
case RETURN:
return "RETURN";
case STRING_LITERAL:
- return child0.toString();
+ return "\"" + ((String)child0) + "\"";
case DOLLAR:
return ((String)child0);
default:
Modified: labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/sym.java
===================================================================
--- labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/sym.java 2009-09-14 10:34:21 UTC (rev 29328)
+++ labs/jbosstm/workspace/adinn/byteman/trunk/src/org/jboss/byteman/rule/grammar/sym.java 2009-09-14 10:38:56 UTC (rev 29329)
@@ -1,7 +1,7 @@
//----------------------------------------------------
// The following code was generated by CUP v0.10k
-// Mon Sep 14 10:26:17 BST 2009
+// Mon Sep 14 11:28:55 BST 2009
//----------------------------------------------------
package org.jboss.byteman.rule.grammar;
More information about the jboss-svn-commits
mailing list