This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository eclipse-wtp.
commit d934769bff783c452e297b0498167f88824b9000 Author: Jakub Adam <[email protected]> Date: Sat Mar 8 17:56:45 2014 +0100 Refreshed d/patches/regenerate-js-parser-resources.patch --- debian/changelog | 1 + .../patches/regenerate-js-parser-resources.patch | 81 +++++++++++----------- 2 files changed, 43 insertions(+), 39 deletions(-) diff --git a/debian/changelog b/debian/changelog index 38c4175..65e45ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ eclipse-wtp (3.5.2-1) UNRELEASED; urgency=medium * New upstream release. + * Refreshed d/patches/regenerate-js-parser-resources.patch. -- Jakub Adam <[email protected]> Sat, 08 Mar 2014 17:33:38 +0100 diff --git a/debian/patches/regenerate-js-parser-resources.patch b/debian/patches/regenerate-js-parser-resources.patch index 1786a97..19a5c72 100644 --- a/debian/patches/regenerate-js-parser-resources.patch +++ b/debian/patches/regenerate-js-parser-resources.patch @@ -6,54 +6,57 @@ Subject: regenerate-js-parser-resources - do not Parser.initTables() when running UpdateParserFiles, as we don't have table data yet --- - .../org/eclipse/wst/jsdt/internal/compiler/parser/Parser.java | 9 +++++++-- - .../wst/jsdt/internal/compiler/parser/TerminalTokens.java | 5 +++++ - 2 files changed, 12 insertions(+), 2 deletions(-) + .../eclipse/wst/jsdt/internal/compiler/parser/Parser.java | 12 +++++++++--- + .../wst/jsdt/internal/compiler/parser/TerminalTokens.java | 5 +++++ + 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/Parser.java b/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/Parser.java -index a615d7f..a258378 100644 +index cedf049..b66796f 100644 --- a/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/Parser.java +++ b/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/Parser.java @@ -327,8 +327,10 @@ public class Parser implements ParserBasicInformation, TerminalTokens, Operator - public IInferEngine[] inferenceEngines; - - static { -+ StackTraceElement[] trace = Thread.currentThread().getStackTrace(); - try{ -- initTables(); -+ if (!trace[trace.length - 1].getClassName().endsWith("UpdateParserFiles")) -+ initTables(); - } catch(java.io.IOException ex){ - throw new ExceptionInInitializerError(ex.getMessage()); - } + public IInferEngine[] inferenceEngines; + + static { ++ StackTraceElement[] trace = Thread.currentThread().getStackTrace(); + try{ +- initTables(); ++ if (!trace[trace.length - 1].getClassName().endsWith("UpdateParserFiles")) ++ initTables(); + } catch(java.io.IOException ex){ + throw new ExceptionInInitializerError(ex.getMessage()); + } @@ -764,7 +766,7 @@ public final static void buildFilesFromLPG(String dataFilename, String dataFilen - - buildFilesForFlags( - prefix + (++i) + ".rsc", //$NON-NLS-1$ -- rhs.length, -+ newRhs.length, - tokens); - - -@@ -2791,6 +2793,8 @@ protected void consumePostDoc() { - } - } - + + buildFilesForFlags( + prefix + (++i) + ".rsc", //$NON-NLS-1$ +- rhs.length, ++ newRhs.length, + tokens); + + +@@ -2791,7 +2793,9 @@ protected void consumePostDoc() { + } + } + +-//This method is part of an automatic generation : do NOT edit-modify +// ### BEGIN GENERATED CODE ### + - // This method is part of an automatic generation : do NOT edit-modify - protected void consumeRule(int act) { - switch ( act ) { -@@ -3752,6 +3756,7 @@ protected void consumeRule(int act) { - } - } - ++//This method is part of an automatic generation : do NOT edit-modify + protected void consumeRule(int act) { + switch ( act ) { + case 23 : if (DEBUG) { System.out.println("CompilationUnit ::= EnterCompilationUnit..."); } //$NON-NLS-1$ +@@ -3752,6 +3756,8 @@ consumeMethodDeclaration(false); + } + } + +// ### END GENERATED CODE ### - - private void consumeElisionList() { - int flag=this.intStack[this.intPtr]; ++ + private void consumeElisionList() { + int flag=this.intStack[this.intPtr]; + if ((flag&UNCONSUMED_ELISION)!=0) diff --git a/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/TerminalTokens.java b/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/TerminalTokens.java -index e98347c..bd28bc2 100644 +index c6b1a9b..4539354 100644 --- a/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/TerminalTokens.java +++ b/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/compiler/parser/TerminalTokens.java @@ -34,6 +34,8 @@ public interface TerminalTokens { @@ -62,7 +65,7 @@ index e98347c..bd28bc2 100644 +// ### BEGIN GENERATED CODE ### + - int TokenNameIdentifier = 32, + int TokenNameIdentifier = 32, TokenNameabstract = 88, TokenNameboolean = 89, @@ -154,4 +156,7 @@ public interface TerminalTokens { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipse-wtp.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
