From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-java/antlr/files/3.2-java-8.patch | 32 ---- dev-java/antlr/files/3.2-test-fixes.patch | 249 ---------------------------- dev-java/antlr/files/3.5.2-test-fixes.patch | 36 ---- 3 files changed, 317 deletions(-) delete mode 100644 dev-java/antlr/files/3.2-java-8.patch delete mode 100644 dev-java/antlr/files/3.2-test-fixes.patch delete mode 100644 dev-java/antlr/files/3.5.2-test-fixes.patch (limited to 'dev-java/antlr/files') diff --git a/dev-java/antlr/files/3.2-java-8.patch b/dev-java/antlr/files/3.2-java-8.patch deleted file mode 100644 index 662abfe1e17f..000000000000 --- a/dev-java/antlr/files/3.2-java-8.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur antlr-3.3.orig/tool/src/main/java/org/antlr/tool/CompositeGrammar.java antlr-3.3/tool/src/main/java/org/antlr/tool/CompositeGrammar.java ---- antlr-3.3.orig/tool/src/main/java/org/antlr/tool/CompositeGrammar.java 2010-11-30 01:54:04.000000000 +0000 -+++ antlr-3.3/tool/src/main/java/org/antlr/tool/CompositeGrammar.java 2015-10-03 14:28:50.063497181 +0100 -@@ -219,7 +219,9 @@ - public List getIndirectDelegates(Grammar g) { - List direct = getDirectDelegates(g); - List delegates = getDelegates(g); -- delegates.removeAll(direct); -+ if (direct != null) { -+ delegates.removeAll(direct); -+ } - return delegates; - } - -@@ -389,7 +391,7 @@ - Set localRuleDefs = new HashSet(); - Set overrides = new HashSet(); - // compute set of non-overridden rules for this delegate -- for (Rule r : p.grammar.getRules()) { -+ for (Rule r : (Collection) p.grammar.getRules()) { - if ( !ruleDefs.contains(r.name) ) { - localRuleDefs.add(r.name); - } -@@ -409,7 +411,7 @@ - - // pass larger set of defined rules to delegates - if ( p.children!=null ) { -- for (CompositeGrammarTree delegate : p.children) { -+ for (CompositeGrammarTree delegate : (List) p.children) { - _minimizeRuleSet(ruleDefs, delegate); - } - } diff --git a/dev-java/antlr/files/3.2-test-fixes.patch b/dev-java/antlr/files/3.2-test-fixes.patch deleted file mode 100644 index 0544b7006170..000000000000 --- a/dev-java/antlr/files/3.2-test-fixes.patch +++ /dev/null @@ -1,249 +0,0 @@ ---- tool/src/test/java/org/antlr/test/BaseTest.java.orig 2010-11-30 01:54:04.000000000 +0000 -+++ tool/src/test/java/org/antlr/test/BaseTest.java 2015-09-24 22:25:36.872191194 +0100 -@@ -130,8 +130,8 @@ - try { - Process process = - Runtime.getRuntime().exec(args, null, outputDir); -- StreamVacuum stdout = new StreamVacuum(process.getInputStream()); -- StreamVacuum stderr = new StreamVacuum(process.getErrorStream()); -+ StreamVacuum stdout = new StreamVacuum(process.getInputStream(), tmpdir+"/"+fileName); -+ StreamVacuum stderr = new StreamVacuum(process.getErrorStream(), tmpdir+"/"+fileName); - stdout.start(); - stderr.start(); - process.waitFor(); -@@ -406,8 +406,8 @@ - //System.out.println("execParser: "+cmdLine); - Process process = - Runtime.getRuntime().exec(args, null, new File(tmpdir)); -- StreamVacuum stdoutVacuum = new StreamVacuum(process.getInputStream()); -- StreamVacuum stderrVacuum = new StreamVacuum(process.getErrorStream()); -+ StreamVacuum stdoutVacuum = new StreamVacuum(process.getInputStream(), tmpdir+"/input"); -+ StreamVacuum stderrVacuum = new StreamVacuum(process.getErrorStream(), tmpdir+"/input"); - stdoutVacuum.start(); - stderrVacuum.start(); - process.waitFor(); -@@ -499,8 +499,10 @@ - StringBuffer buf = new StringBuffer(); - BufferedReader in; - Thread sucker; -- public StreamVacuum(InputStream in) { -+ String inputFile; -+ public StreamVacuum(InputStream in, String inputFile) { - this.in = new BufferedReader( new InputStreamReader(in) ); -+ this.inputFile = inputFile; - } - public void start() { - sucker = new Thread(this); -@@ -510,6 +512,8 @@ - try { - String line = in.readLine(); - while (line!=null) { -+ if (line.startsWith(inputFile)) -+ line = line.substring(inputFile.length()+1); - buf.append(line); - buf.append('\n'); - line = in.readLine(); ---- tool/src/test/java/org/antlr/test/TestTopologicalSort.java.orig 2009-09-23 19:36:14.000000000 +0100 -+++ tool/src/test/java/org/antlr/test/TestTopologicalSort.java 2010-11-30 01:54:04.000000000 +0000 -@@ -49,7 +49,7 @@ - g.addEdge("F", "H"); - g.addEdge("E", "F"); - -- String expecting = "[H, F, E, D, A, G, B, C]"; -+ String expecting = "[H, F, E, D, G, A, B, C]"; - List nodes = g.sort(); - String result = nodes.toString(); - assertEquals(expecting, result); -@@ -91,7 +91,7 @@ - g.addEdge("Def.g", "Java.tokens"); // walkers feed off generated tokens - g.addEdge("Ref.g", "Java.tokens"); - -- String expecting = "[MyJava.tokens, Java.g, Java.tokens, Def.g, Ref.g]"; -+ String expecting = "[MyJava.tokens, Java.g, Java.tokens, Ref.g, Def.g]"; - List nodes = g.sort(); - String result = nodes.toString(); - assertEquals(expecting, result); -@@ -105,7 +105,7 @@ - g.addEdge("Def.g", "JavaLexer.tokens"); - g.addEdge("Ref.g", "JavaLexer.tokens"); - -- String expecting = "[JavaLexer.g, JavaLexer.tokens, JavaParser.g, Def.g, Ref.g]"; -+ String expecting = "[JavaLexer.g, JavaLexer.tokens, JavaParser.g, Ref.g, Def.g]"; - List nodes = g.sort(); - String result = nodes.toString(); - assertEquals(expecting, result); ---- tool/src/test/java/org/antlr/test/TestSemanticPredicates.java.orig 2009-09-23 19:36:12.000000000 +0100 -+++ tool/src/test/java/org/antlr/test/TestSemanticPredicates.java 2015-12-05 13:52:05.923411552 +0000 -@@ -731,19 +731,23 @@ - "c : a\n" + - " | b\n" + - " ;\n"); -- String expecting = -- ".s0-X->.s1\n" + -- ".s1-{((a&&c)||(b&&c))}?->:s2=>1\n" + -- ".s1-{c}?->:s3=>2\n"; -- int[] unreachableAlts = null; -- int[] nonDetAlts = null; -- String ambigInput = null; -- int[] insufficientPredAlts = null; -- int[] danglingAlts = null; -- int numWarnings = 0; -- checkDecision(g, 3, expecting, unreachableAlts, -- nonDetAlts, ambigInput, insufficientPredAlts, -- danglingAlts, numWarnings, false); -+ try { -+ String expecting = -+ ".s0-X->.s1\n" + -+ ".s1-{((a&&c)||(b&&c))}?->:s2=>1\n" + -+ ".s1-{c}?->:s3=>2\n"; -+ checkDecision(g, 3, expecting, null, -+ null, null, null, -+ null, 0, false); -+ } catch (org.junit.ComparisonFailure e) { -+ String expecting = -+ ".s0-X->.s1\n" + -+ ".s1-{((b&&c)||(a&&c))}?->:s2=>1\n" + -+ ".s1-{c}?->:s3=>2\n"; -+ checkDecision(g, 3, expecting, null, -+ null, null, null, -+ null, 0, false); -+ } - } - - @Test ---- tool/src/test/java/org/antlr/test/TestAttributes.java.orig 2015-12-05 13:55:55.392843185 +0000 -+++ tool/src/test/java/org/antlr/test/TestAttributes.java 2015-12-05 14:04:38.120599871 +0000 -@@ -439,20 +439,15 @@ - ErrorManager.setErrorListener(equeue); - Grammar g = new Grammar( - "parser grammar t;\n"+ -- "a : x=b {"+action+"} ;\n" + -+ "a : x=b {###"+action+"!!!} ;\n" + - "b : B ;\n"); - Tool antlr = newTool(); - CodeGenerator generator = new CodeGenerator(antlr, g, "Java"); - g.setCodeGenerator(generator); -- generator.genRecognizer(); // forces load of templates -- ActionTranslator translator = new ActionTranslator(generator,"a", -- new antlr.CommonToken(ANTLRParser.ACTION,action),1); -- String rawTranslation = -- translator.translate(); -- StringTemplateGroup templates = -- new StringTemplateGroup(".", AngleBracketTemplateLexer.class); -- StringTemplate actionST = new StringTemplate(templates, rawTranslation); -- String found = actionST.toString(); -+ generator.genRecognizer(); // codegen phase sets some vars we need -+ StringTemplate codeST = generator.getRecognizerST(); -+ String code = codeST.toString(); -+ String found = code.substring(code.indexOf("###")+3,code.indexOf("!!!")); - assertEquals(expecting, found); - - assertEquals("unexpected errors: "+equeue, 0, equeue.errors.size()); -@@ -1771,20 +1766,15 @@ - Grammar g = new Grammar( - "parser grammar t;\n" + - "options {output=template;}\n"+ -- "a : {"+action+"}\n" + -+ "a : {###"+action+"!!!}\n" + - " ;\n"); - Tool antlr = newTool(); - CodeGenerator generator = new CodeGenerator(antlr, g, "Java"); - g.setCodeGenerator(generator); -- generator.genRecognizer(); // forces load of templates -- ActionTranslator translator = new ActionTranslator(generator,"a", -- new antlr.CommonToken(ANTLRParser.ACTION,action),1); -- String rawTranslation = -- translator.translate(); -- StringTemplateGroup templates = -- new StringTemplateGroup(".", AngleBracketTemplateLexer.class); -- StringTemplate actionST = new StringTemplate(templates, rawTranslation); -- String found = actionST.toString(); -+ generator.genRecognizer(); // codegen phase sets some vars we need -+ StringTemplate codeST = generator.getRecognizerST(); -+ String code = codeST.toString(); -+ String found = code.substring(code.indexOf("###")+3,code.indexOf("!!!")); - assertEquals(expecting, found); - - assertEquals("unexpected errors: "+equeue, 0, equeue.errors.size()); -@@ -1869,35 +1859,21 @@ - ErrorManager.setErrorListener(equeue); - Grammar g = new Grammar( - "grammar t;\n"+ -- "a : b {"+action+"}\n" + -- " | c {"+action2+"}\n" + -+ "a : b {###"+action+"!!!}\n" + -+ " | c {^^^"+action2+"&&&}\n" + - " ;\n" + - "b : 'a';\n" + - "c : '0';\n"); - Tool antlr = newTool(); - CodeGenerator generator = new CodeGenerator(antlr, g, "Java"); - g.setCodeGenerator(generator); -- generator.genRecognizer(); // forces load of templates -- ActionTranslator translator = new ActionTranslator(generator,"a", -- new antlr.CommonToken(ANTLRParser.ACTION,action),1); -- String rawTranslation = -- translator.translate(); -- StringTemplateGroup templates = -- new StringTemplateGroup(".", AngleBracketTemplateLexer.class); -- StringTemplate actionST = new StringTemplate(templates, rawTranslation); -- String found = actionST.toString(); -+ generator.genRecognizer(); // codegen phase sets some vars we need -+ StringTemplate codeST = generator.getRecognizerST(); -+ String code = codeST.toString(); -+ String found = code.substring(code.indexOf("###")+3,code.indexOf("!!!")); - assertEquals(expecting, found); - -- assertEquals("unexpected errors: "+equeue, 0, equeue.errors.size()); -- translator = new ActionTranslator(generator, -- "a", -- new antlr.CommonToken(ANTLRParser.ACTION,action2),2); -- rawTranslation = -- translator.translate(); -- templates = -- new StringTemplateGroup(".", AngleBracketTemplateLexer.class); -- actionST = new StringTemplate(templates, rawTranslation); -- found = actionST.toString(); -+ found = code.substring(code.indexOf("^^^")+3,code.indexOf("&&&")); - - assertEquals(expecting2, found); - -@@ -3208,7 +3184,7 @@ - - @Test public void testAssignToTreeNodeAttribute() throws Exception { - String action = "$tree.scope = localScope;"; -- String expecting = "(()retval.tree).scope = localScope;"; -+ String expecting = "((Object)retval.tree).scope = localScope;"; - ErrorQueue equeue = new ErrorQueue(); - ErrorManager.setErrorListener(equeue); - Grammar g = new Grammar( -@@ -3219,24 +3195,17 @@ - " Scope localScope=null;\n" + - "}\n" + - "@after {\n" + -- " $tree.scope = localScope;\n" + -+ " ###$tree.scope = localScope;!!!\n" + - "}\n" + - " : 'a' -> ^('a')\n" + - ";"); - Tool antlr = newTool(); - CodeGenerator generator = new CodeGenerator(antlr, g, "Java"); - g.setCodeGenerator(generator); -- generator.genRecognizer(); // forces load of templates -- ActionTranslator translator = new ActionTranslator(generator, -- "rule", -- new antlr.CommonToken(ANTLRParser.ACTION,action),1); -- String rawTranslation = -- translator.translate(); -- StringTemplateGroup templates = -- new StringTemplateGroup(".", AngleBracketTemplateLexer.class); -- StringTemplate actionST = new StringTemplate(templates, rawTranslation); -- String found = actionST.toString(); -- assertEquals("unexpected errors: "+equeue, 0, equeue.errors.size()); -+ generator.genRecognizer(); // codegen phase sets some vars we need -+ StringTemplate codeST = generator.getRecognizerST(); -+ String code = codeST.toString(); -+ String found = code.substring(code.indexOf("###")+3,code.indexOf("!!!")); - assertEquals(expecting, found); - } - diff --git a/dev-java/antlr/files/3.5.2-test-fixes.patch b/dev-java/antlr/files/3.5.2-test-fixes.patch deleted file mode 100644 index f2609ac1f0b5..000000000000 --- a/dev-java/antlr/files/3.5.2-test-fixes.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestAttributes.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestAttributes.java ---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestAttributes.java 2014-03-25 11:47:54.000000000 +0000 -+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestAttributes.java 2015-10-02 22:42:56.921263410 +0100 -@@ -2131,7 +2132,7 @@ - assertEquals(expecting, found); - } - -- @Test public void testRuleLabelOnTwoDifferentRulesTemplate() throws Exception { -+ @org.junit.Ignore @Test public void testRuleLabelOnTwoDifferentRulesTemplate() throws Exception { - String grammar = - "grammar T;\n"+ - "options {output=template;}\n"+ -diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java ---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java 2014-03-25 11:47:54.000000000 +0000 -+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestSyntacticPredicateEvaluation.java 2015-10-02 22:43:07.303105023 +0100 -@@ -339,7 +340,7 @@ - assertEquals("b:alt 2 a:alt 1\n", found); - } - -- @Test public void testSynPredWithOutputTemplate() throws Exception { -+ @org.junit.Ignore @Test public void testSynPredWithOutputTemplate() throws Exception { - // really just seeing if it will compile - String grammar = - "grammar T;\n" + -diff -Naur antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestTreeParsing.java antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestTreeParsing.java ---- antlr3-3.5.2.orig/tool/src/test/java/org/antlr/test/TestTreeParsing.java 2014-03-25 11:47:54.000000000 +0000 -+++ antlr3-3.5.2/tool/src/test/java/org/antlr/test/TestTreeParsing.java 2015-10-02 22:41:32.235554776 +0100 -@@ -141,7 +142,7 @@ - assertEquals("alt 1\n", found); - } - -- @Test public void testTemplateOutput() throws Exception { -+ @org.junit.Ignore @Test public void testTemplateOutput() throws Exception { - String grammar = - "grammar T;\n" + - "options {output=AST;}\n" + -- cgit v1.2.3