You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by jw...@apache.org on 2016/07/07 19:48:36 UTC
[2/2] groovy git commit: GROOVY-7697 - backport changes for 2_4_X
GROOVY-7697 - backport changes for 2_4_X
Partial backport of changes from commit 058dd40f so the
new XStreamUtils class is used to serialize AST.
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/56dfa5cb
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/56dfa5cb
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/56dfa5cb
Branch: refs/heads/GROOVY_2_4_X
Commit: 56dfa5cbb673ce0caeaeb1f5def73efb483e0b40
Parents: 65ce85d
Author: John Wagenleitner <jw...@apache.org>
Authored: Thu Jul 7 11:10:12 2016 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Thu Jul 7 11:10:12 2016 -0700
----------------------------------------------------------------------
.../org/codehaus/groovy/antlr/AntlrParserPlugin.java | 13 ++-----------
src/main/org/codehaus/groovy/control/SourceUnit.java | 12 +-----------
2 files changed, 3 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/56dfa5cb/src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java b/src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java
index e30df3e..7d8c373 100644
--- a/src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java
+++ b/src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java
@@ -22,7 +22,6 @@ import antlr.RecognitionException;
import antlr.TokenStreamException;
import antlr.TokenStreamRecognitionException;
import antlr.collections.AST;
-import com.thoughtworks.xstream.XStream;
import org.codehaus.groovy.GroovyBugError;
import org.codehaus.groovy.antlr.parser.GroovyLexer;
import org.codehaus.groovy.antlr.parser.GroovyRecognizer;
@@ -34,12 +33,12 @@ import org.codehaus.groovy.ast.stmt.*;
import org.codehaus.groovy.control.CompilationFailedException;
import org.codehaus.groovy.control.ParserPlugin;
import org.codehaus.groovy.control.SourceUnit;
+import org.codehaus.groovy.control.XStreamUtils;
import org.codehaus.groovy.syntax.*;
import org.objectweb.asm.Opcodes;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
-import java.io.FileWriter;
import java.io.PrintStream;
import java.io.Reader;
import java.security.AccessController;
@@ -229,15 +228,7 @@ public class AntlrParserPlugin extends ASTHelper implements ParserPlugin, Groovy
}
private static void saveAsXML(String name, AST ast) {
- XStream xstream = new XStream();
- try {
- xstream.toXML(ast, new FileWriter(name + ".antlr.xml"));
- System.out.println("Written AST to " + name + ".antlr.xml");
- }
- catch (Exception e) {
- System.out.println("Couldn't write to " + name + ".antlr.xml");
- e.printStackTrace();
- }
+ XStreamUtils.serialize(name + ".antlr", ast);
}
public ModuleNode buildAST(SourceUnit sourceUnit, ClassLoader classLoader, Reduction cst) throws ParserException {
http://git-wip-us.apache.org/repos/asf/groovy/blob/56dfa5cb/src/main/org/codehaus/groovy/control/SourceUnit.java
----------------------------------------------------------------------
diff --git a/src/main/org/codehaus/groovy/control/SourceUnit.java b/src/main/org/codehaus/groovy/control/SourceUnit.java
index 593402d..fd2e53f 100644
--- a/src/main/org/codehaus/groovy/control/SourceUnit.java
+++ b/src/main/org/codehaus/groovy/control/SourceUnit.java
@@ -21,7 +21,6 @@ package org.codehaus.groovy.control;
import groovy.lang.GroovyClassLoader;
import java.io.File;
-import java.io.FileWriter;
import java.io.IOException;
import java.io.Reader;
import java.net.URL;
@@ -46,8 +45,6 @@ import antlr.MismatchedCharException;
import antlr.NoViableAltException;
import antlr.NoViableAltForCharException;
-import com.thoughtworks.xstream.XStream;
-
/**
* Provides an anchor for a single source unit (usually a script file)
* as it passes through the compiler system.
@@ -293,14 +290,7 @@ public class SourceUnit extends ProcessingUnit {
}
private static void saveAsXML(String name, ModuleNode ast) {
- XStream xstream = new XStream();
- try {
- xstream.toXML(ast, new FileWriter(name + ".xml"));
- System.out.println("Written AST to " + name + ".xml");
- } catch (Exception e) {
- System.out.println("Couldn't write to " + name + ".xml");
- e.printStackTrace();
- }
+ XStreamUtils.serialize(name, ast);
}
//--------------------------------------------------------------------------- // SOURCE SAMPLING