[jasmin-sable] 47/78: Add 04-fix-field-support.diff to fix parsing of field definitions (Closes: #538861)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jasmin-sable.

commit 39c24be27c598f4de4593e54ce67ed97d1e0e882
Author: Chris Lamb <lamby at debian.org>
Date:   Thu Jul 30 15:33:04 2009 +0200

    Add 04-fix-field-support.diff to fix parsing of field definitions (Closes: #538861)
---
 debian/changelog                         |  2 ++
 debian/patches/04-fix-field-support.diff | 35 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 38 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7eff169..37d20a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ jasmin-sable (2.3.0-4) UNRELEASED; urgency=low
   * Update 03-cup-11-support.diff to modify parser.cup instead of the generated
     parser.java.
   * Ensure parser.java is rebuilt from parser.cup.
+  * Add 04-fix-field-support.diff to fix parsing of field definitions
+    (Closes: #538861)
 
  -- Chris Lamb <lamby at debian.org>  Tue, 28 Jul 2009 01:30:38 +0200
 
diff --git a/debian/patches/04-fix-field-support.diff b/debian/patches/04-fix-field-support.diff
new file mode 100644
index 0000000..6afd8f1
--- /dev/null
+++ b/debian/patches/04-fix-field-support.diff
@@ -0,0 +1,35 @@
+
+  * Fixes parsing of field definitions (Closes: #538861)
+
+ -- Chris Lamb <lamby at debian.org>  Thu, 30 Jul 2009 15:28:41 +0200
+
+diff -urNad /tmp/bp-build/jasmin-sable.orig/src/jasmin/parser.cup /tmp/bp-build/jasmin-sable/src/jasmin/parser.cup
+--- jasmin-sable.orig/src/jasmin/parser.cup	2009-07-30 15:18:09.000000000 +0200
++++ jasmin-sable/src/jasmin/parser.cup	2009-07-30 15:18:41.000000000 +0200
+@@ -298,22 +298,22 @@
+ field_item ::= field_spec field_attrs | field_spec;
+ 
+ field_spec ::=
+-    DFIELD access:a Str:name Word:sig optional_default:v SEP deprecated_attr:dep_attr signature_attr:sig_attr annotation_attr_opt:vis_annot_attr
++    DFIELD access:a Word:name Word:sig optional_default:v SEP deprecated_attr:dep_attr signature_attr:sig_attr annotation_attr_opt:vis_annot_attr
+         {:
+             classFile.addField((short)a.intValue(), name, sig, v, dep_attr, sig_attr, vis_annot_attr, null);
+         :}
+    |
+-   DFIELD access:a Str:name Word:sig optional_default:v DSYNTHETIC SEP deprecated_attr:dep_attr signature_attr:sig_attr annotation_attr_opt:vis_annot_attr
++   DFIELD access:a Word:name Word:sig optional_default:v DSYNTHETIC SEP deprecated_attr:dep_attr signature_attr:sig_attr annotation_attr_opt:vis_annot_attr
+         {:
+             classFile.addField((short)a.intValue(), name, sig, v, "synth", dep_attr, sig_attr, vis_annot_attr, null);
+         :}
+    |
+-    DFIELD access:a Str:name Word:sig optional_default:v SEP deprecated_attr:dep_attr signature_attr:sig_attr annotation_attr:vis_annot_attr1 annotation_attr:vis_annot_attr2
++    DFIELD access:a Word:name Word:sig optional_default:v SEP deprecated_attr:dep_attr signature_attr:sig_attr annotation_attr:vis_annot_attr1 annotation_attr:vis_annot_attr2
+         {:
+             classFile.addField((short)a.intValue(), name, sig, v, dep_attr, sig_attr, vis_annot_attr1, vis_annot_attr2);
+         :}
+    |
+-   DFIELD access:a Str:name Word:sig optional_default:v DSYNTHETIC SEP deprecated_attr:dep_attr signature_attr:sig_attr annotation_attr:vis_annot_attr1 annotation_attr:vis_annot_attr2
++   DFIELD access:a Word:name Word:sig optional_default:v DSYNTHETIC SEP deprecated_attr:dep_attr signature_attr:sig_attr annotation_attr:vis_annot_attr1 annotation_attr:vis_annot_attr2
+         {:
+             classFile.addField((short)a.intValue(), name, sig, v, "synth", dep_attr, sig_attr, vis_annot_attr1, vis_annot_attr2);
+         :}
diff --git a/debian/patches/series b/debian/patches/series
index 2298e5b..5e2524b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01-ant-settings.diff
 02-jasmin-executable.diff
 03-cup-0-11-support.diff
+04-fix-field-support.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jasmin-sable.git