public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/antlr3] epel10: Fix Java 8 patch
@ 2026-07-22 19:37 Michael Simacek
  0 siblings, 0 replies; only message in thread
From: Michael Simacek @ 2026-07-22 19:37 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/antlr3
            Branch : epel10
            Commit : 02d60a580e1706282941f3459c4b160d99972567
            Author : Michael Simacek <msimacek@redhat.com>
            Date   : 2016-09-27T18:19:40+02:00
            Stats  : +9/-19 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/antlr3/c/02d60a580e1706282941f3459c4b160d99972567?branch=epel10

            Log:
            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.

---
diff --git a/0001-java8-fix.patch b/0001-java8-fix.patch
index e5146d4..a05238d 100644
--- a/0001-java8-fix.patch
+++ b/0001-java8-fix.patch
@@ -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>
 Date: Tue, 17 Jun 2014 19:36:24 +0200
 Subject: [PATCH] java8 fix
@@ -6,13 +6,12 @@ Subject: [PATCH] java8 fix
 Signed-off-by: Michael Simacek <msimacek@redhat.com>
 ---
  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/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
-index 57495b2..eada38e 100644
+index b279bd5..566e33c 100644
 --- a/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 {
@@ -24,20 +23,8 @@ index 57495b2..eada38e 100644
  
  		// then translate via codegen.g
  		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
-index 91bbad9..dc4774a 100644
+index 667ebb2..4ca4328 100644
 --- a/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 {
@@ -72,5 +59,5 @@ index f411090..ddda4ed 100644
          rewrite(g.getTreeAdaptor(),t,g.getTokenNames());
      }
 -- 
-1.9.3
+2.7.4
 

diff --git a/antlr3.spec b/antlr3.spec
index 6c92c69..a497b09 100644
--- a/antlr3.spec
+++ b/antlr3.spec
@@ -1,7 +1,7 @@
 %global antlr_version 3.5.2
 %global c_runtime_version 3.4
 %global javascript_runtime_version 3.1
-%global baserelease 11
+%global baserelease 12
 
 Summary:            ANother Tool for Language Recognition
 Name:               antlr3
@@ -263,6 +263,9 @@ install -pm 644 runtime/Cpp/include/* $RPM_BUILD_ROOT/%{_includedir}/
 %doc tool/LICENSE.txt
 
 %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
 - Regenerate build-requires
 

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-22 19:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-22 19:37 [rpms/antlr3] epel10: Fix Java 8 patch Michael Simacek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox