Fix Java 8 patch
The patch removed a case statement, which in turn broke my hello world grammar. I have no idea why it did so (git blames me, I don't remember a thing), so I'm removing the offending part.
This commit is contained in:
parent
e6eac62140
commit
02d60a580e
|
@ -1,4 +1,4 @@
|
||||||
From d0aa3d0a4f323cb1464c02d53711c2a0cd24c10d Mon Sep 17 00:00:00 2001
|
From 33f662c60e6e7b703e197854d2478a8747f044f0 Mon Sep 17 00:00:00 2001
|
||||||
From: Michael Simacek <msimacek@redhat.com>
|
From: Michael Simacek <msimacek@redhat.com>
|
||||||
Date: Tue, 17 Jun 2014 19:36:24 +0200
|
Date: Tue, 17 Jun 2014 19:36:24 +0200
|
||||||
Subject: [PATCH] java8 fix
|
Subject: [PATCH] java8 fix
|
||||||
|
@ -6,13 +6,12 @@ Subject: [PATCH] java8 fix
|
||||||
Signed-off-by: Michael Simacek <msimacek@redhat.com>
|
Signed-off-by: Michael Simacek <msimacek@redhat.com>
|
||||||
---
|
---
|
||||||
tool/src/main/java/org/antlr/codegen/CodeGenerator.java | 2 +-
|
tool/src/main/java/org/antlr/codegen/CodeGenerator.java | 2 +-
|
||||||
tool/src/main/java/org/antlr/tool/ErrorManager.java | 1 -
|
|
||||||
tool/src/main/java/org/antlr/tool/Grammar.java | 4 ++--
|
tool/src/main/java/org/antlr/tool/Grammar.java | 4 ++--
|
||||||
tool/src/main/java/org/antlr/tool/Strip.java | 2 +-
|
tool/src/main/java/org/antlr/tool/Strip.java | 2 +-
|
||||||
4 files changed, 4 insertions(+), 5 deletions(-)
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
diff --git a/tool/src/main/java/org/antlr/codegen/CodeGenerator.java b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
|
diff --git a/tool/src/main/java/org/antlr/codegen/CodeGenerator.java b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
|
||||||
index 57495b2..eada38e 100644
|
index b279bd5..566e33c 100644
|
||||||
--- a/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
|
--- a/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
|
||||||
+++ b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
|
+++ b/tool/src/main/java/org/antlr/codegen/CodeGenerator.java
|
||||||
@@ -1087,7 +1087,7 @@ public class CodeGenerator {
|
@@ -1087,7 +1087,7 @@ public class CodeGenerator {
|
||||||
|
@ -24,20 +23,8 @@ index 57495b2..eada38e 100644
|
||||||
|
|
||||||
// then translate via codegen.g
|
// then translate via codegen.g
|
||||||
CodeGenTreeWalker gen = new CodeGenTreeWalker(new CommonTreeNodeStream(rewriteTree));
|
CodeGenTreeWalker gen = new CodeGenTreeWalker(new CommonTreeNodeStream(rewriteTree));
|
||||||
diff --git a/tool/src/main/java/org/antlr/tool/ErrorManager.java b/tool/src/main/java/org/antlr/tool/ErrorManager.java
|
|
||||||
index d3223ae..122c861 100644
|
|
||||||
--- a/tool/src/main/java/org/antlr/tool/ErrorManager.java
|
|
||||||
+++ b/tool/src/main/java/org/antlr/tool/ErrorManager.java
|
|
||||||
@@ -385,7 +385,6 @@ public class ErrorManager {
|
|
||||||
public void runTimeError(STMessage msg) {
|
|
||||||
switch (msg.error) {
|
|
||||||
case NO_SUCH_ATTRIBUTE:
|
|
||||||
- case NO_SUCH_ATTRIBUTE_PASS_THROUGH:
|
|
||||||
case NO_SUCH_PROPERTY:
|
|
||||||
ErrorManager.warning(ErrorManager.MSG_STRING_TEMPLATE_ERROR, msg.toString());
|
|
||||||
return;
|
|
||||||
diff --git a/tool/src/main/java/org/antlr/tool/Grammar.java b/tool/src/main/java/org/antlr/tool/Grammar.java
|
diff --git a/tool/src/main/java/org/antlr/tool/Grammar.java b/tool/src/main/java/org/antlr/tool/Grammar.java
|
||||||
index 91bbad9..dc4774a 100644
|
index 667ebb2..4ca4328 100644
|
||||||
--- a/tool/src/main/java/org/antlr/tool/Grammar.java
|
--- a/tool/src/main/java/org/antlr/tool/Grammar.java
|
||||||
+++ b/tool/src/main/java/org/antlr/tool/Grammar.java
|
+++ b/tool/src/main/java/org/antlr/tool/Grammar.java
|
||||||
@@ -706,7 +706,7 @@ public class Grammar {
|
@@ -706,7 +706,7 @@ public class Grammar {
|
||||||
|
@ -72,5 +59,5 @@ index f411090..ddda4ed 100644
|
||||||
rewrite(g.getTreeAdaptor(),t,g.getTokenNames());
|
rewrite(g.getTreeAdaptor(),t,g.getTokenNames());
|
||||||
}
|
}
|
||||||
--
|
--
|
||||||
1.9.3
|
2.7.4
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
%global antlr_version 3.5.2
|
%global antlr_version 3.5.2
|
||||||
%global c_runtime_version 3.4
|
%global c_runtime_version 3.4
|
||||||
%global javascript_runtime_version 3.1
|
%global javascript_runtime_version 3.1
|
||||||
%global baserelease 11
|
%global baserelease 12
|
||||||
|
|
||||||
Summary: ANother Tool for Language Recognition
|
Summary: ANother Tool for Language Recognition
|
||||||
Name: antlr3
|
Name: antlr3
|
||||||
|
@ -263,6 +263,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/
|
||||||
%doc tool/LICENSE.txt
|
%doc tool/LICENSE.txt
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Sep 27 2016 Michael Simacek <msimacek@redhat.com> - 1:3.5.2-12
|
||||||
|
- Fix Java 8 patch
|
||||||
|
|
||||||
* Wed Jun 15 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.5.2-11
|
* Wed Jun 15 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1:3.5.2-11
|
||||||
- Regenerate build-requires
|
- Regenerate build-requires
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue