From 2763746520712a77816d619a7b12547f0f54ad67 Mon Sep 17 00:00:00 2001 From: gregor herrmann Date: Tue, 3 Aug 2010 16:57:25 +0000 Subject: [PATCH] refresh patch format/headers --- debian/patches/05_antlr32.patch | 495 ++++++++++++++++---------------- 1 file changed, 245 insertions(+), 250 deletions(-) diff --git a/debian/patches/05_antlr32.patch b/debian/patches/05_antlr32.patch index db4a29e..c9bb3bb 100644 --- a/debian/patches/05_antlr32.patch +++ b/debian/patches/05_antlr32.patch @@ -1,18 +1,24 @@ -Index: BstParser.java +Description: include new BstParser/Lexer classes generated by antlr 3.2 +Origin: vendor +Bug: http://bugs.debian.org/591124 +Forwarded: not-yet +Author: tony mancill +Last-Update: 2010-08-03 + =================================================================== ---- a/src/java/net/sf/jabref/bst/BstParser.java (revision 2214) -+++ b/src/java/net/sf/jabref/bst/BstParser.java (working copy) -@@ -1,52 +1,62 @@ +--- a/src/java/net/sf/jabref/bst/BstParser.java ++++ b/src/java/net/sf/jabref/bst/BstParser.java +@@ -1,51 +1,61 @@ package net.sf.jabref.bst; -// $ANTLR 3.0b5 Bst.g 2006-11-23 23:20:24 +// $ANTLR 3.2 debian-4 Bst.g 2010-08-02 19:59:10 +-import java.util.ArrayList; +import org.antlr.runtime.*; +import java.util.Stack; -+import java.util.List; - import java.util.ArrayList; --import java.util.List; + import java.util.List; ++import java.util.ArrayList; -import org.antlr.runtime.BitSet; -import org.antlr.runtime.EarlyExitException; @@ -59,41 +65,40 @@ Index: BstParser.java - public static final int EXECUTE=14; - public static final int LINE_COMMENT=24; - public static final int SORT=17; -+ public static final int READ=13; -+ public static final int IDENTIFIER=18; -+ public static final int IDLIST=4; -+ public static final int NUMERAL=22; - public static final int STACK=5; - public static final int REVERSE=16; +- public static final int STACK=5; +- public static final int REVERSE=16; - public static final int QUOTED=20; - public static final int INTEGER=19; - public static final int ITERATE=15; - public static final int FUNCTION=10; - public static final int EOF=-1; - public static final int STRINGS=8; -- public static final int IDENTIFIER=18; - public static final int MACRO=11; -- public static final int IDLIST=4; -- public static final int NUMERAL=22; ++ public static final int READ=13; + public static final int IDENTIFIER=18; +- public static final int MACRO=11; + public static final int IDLIST=4; + public static final int NUMERAL=22; - public static final int READ=13; ++ public static final int STACK=5; ++ public static final int REVERSE=16; ++ public static final int MACRO=11; + public static final int STRING=12; - ++ + // delegates + // delegators + -+ + public BstParser(TokenStream input) { - super(input); + this(input, new RecognizerSharedState()); - } ++ } + public BstParser(TokenStream input, RecognizerSharedState state) { + super(input, state); -+ -+ } ++ + } protected TreeAdaptor adaptor = new CommonTreeAdaptor(); - -@@ -57,29 +67,29 @@ +@@ -57,29 +67,29 @@ public class BstParser extends Parser { return adaptor; } @@ -131,7 +136,7 @@ Index: BstParser.java // Bst.g:14:11: ( commands )+ { // Bst.g:14:11: ( commands )+ -@@ -88,6 +98,7 @@ +@@ -88,6 +98,7 @@ public class BstParser extends Parser { do { int alt1=2; int LA1_0 = input.LA(1); @@ -139,7 +144,7 @@ Index: BstParser.java if ( (LA1_0==ENTRY||(LA1_0>=STRINGS && LA1_0<=MACRO)||(LA1_0>=READ && LA1_0<=SORT)) ) { alt1=1; } -@@ -99,10 +110,11 @@ +@@ -99,9 +110,10 @@ public class BstParser extends Parser { { pushFollow(FOLLOW_commands_in_program45); commands1=commands(); @@ -147,13 +152,12 @@ Index: BstParser.java - list_commands.add(commands1.tree); + state._fsp--; - -+ stream_commands.add(commands1.getTree()); + ++ stream_commands.add(commands1.getTree()); + } break; - -@@ -116,65 +128,69 @@ +@@ -116,65 +128,69 @@ public class BstParser extends Parser { } while (true); @@ -162,11 +166,11 @@ Index: BstParser.java - - int i_0 = 0; + // elements: commands -+ // token labels: ++ // token labels: + // rule labels: retval -+ // token list labels: -+ // rule list labels: -+ // wildcard labels: ++ // token list labels: ++ // rule list labels: ++ // wildcard labels: retval.tree = root_0; - root_0 = adaptor.nil(); + RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null); @@ -178,26 +182,26 @@ Index: BstParser.java { - Object root_1 = adaptor.nil(); - root_1 = adaptor.becomeRoot(adaptor.create(COMMANDS, "COMMANDS"), root_1); -+ Object root_1 = (Object)adaptor.nil(); -+ root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(COMMANDS, "COMMANDS"), root_1); - +- - // Bst.g:14:35: ( commands )+ - { - int n_1 = list_commands == null ? 0 : list_commands.size(); - -+ if ( !(stream_commands.hasNext()) ) { -+ throw new RewriteEarlyExitException(); -+ } -+ while ( stream_commands.hasNext() ) { -+ adaptor.addChild(root_1, stream_commands.nextTree()); - +- - - if ( n_1==0 ) throw new RuntimeException("Must have more than one element for (...)+ loops"); - for (int i_1=0; i_1' { @@ -1232,12 +1234,12 @@ Index: BstParser.java - char_literal43=input.LT(1); - match(input,28,FOLLOW_28_in_function258); - char_literal43_tree = adaptor.create(char_literal43); -+ char_literal43=(Token)match(input,28,FOLLOW_28_in_function258); ++ char_literal43=(Token)match(input,28,FOLLOW_28_in_function258); + char_literal43_tree = (Object)adaptor.create(char_literal43); adaptor.addChild(root_0, char_literal43_tree); -@@ -936,11 +990,10 @@ +@@ -936,11 +990,10 @@ public class BstParser extends Parser { case 3 : // Bst.g:41:16: '=' { @@ -1247,12 +1249,12 @@ Index: BstParser.java - char_literal44=input.LT(1); - match(input,29,FOLLOW_29_in_function262); - char_literal44_tree = adaptor.create(char_literal44); -+ char_literal44=(Token)match(input,29,FOLLOW_29_in_function262); ++ char_literal44=(Token)match(input,29,FOLLOW_29_in_function262); + char_literal44_tree = (Object)adaptor.create(char_literal44); adaptor.addChild(root_0, char_literal44_tree); -@@ -949,11 +1002,10 @@ +@@ -949,11 +1002,10 @@ public class BstParser extends Parser { case 4 : // Bst.g:41:22: '+' { @@ -1262,12 +1264,12 @@ Index: BstParser.java - char_literal45=input.LT(1); - match(input,30,FOLLOW_30_in_function266); - char_literal45_tree = adaptor.create(char_literal45); -+ char_literal45=(Token)match(input,30,FOLLOW_30_in_function266); ++ char_literal45=(Token)match(input,30,FOLLOW_30_in_function266); + char_literal45_tree = (Object)adaptor.create(char_literal45); adaptor.addChild(root_0, char_literal45_tree); -@@ -962,11 +1014,10 @@ +@@ -962,11 +1014,10 @@ public class BstParser extends Parser { case 5 : // Bst.g:41:28: '-' { @@ -1277,12 +1279,12 @@ Index: BstParser.java - char_literal46=input.LT(1); - match(input,31,FOLLOW_31_in_function270); - char_literal46_tree = adaptor.create(char_literal46); -+ char_literal46=(Token)match(input,31,FOLLOW_31_in_function270); ++ char_literal46=(Token)match(input,31,FOLLOW_31_in_function270); + char_literal46_tree = (Object)adaptor.create(char_literal46); adaptor.addChild(root_0, char_literal46_tree); -@@ -975,11 +1026,10 @@ +@@ -975,11 +1026,10 @@ public class BstParser extends Parser { case 6 : // Bst.g:41:34: ':=' { @@ -1292,12 +1294,12 @@ Index: BstParser.java - string_literal47=input.LT(1); - match(input,32,FOLLOW_32_in_function274); - string_literal47_tree = adaptor.create(string_literal47); -+ string_literal47=(Token)match(input,32,FOLLOW_32_in_function274); ++ string_literal47=(Token)match(input,32,FOLLOW_32_in_function274); + string_literal47_tree = (Object)adaptor.create(string_literal47); adaptor.addChild(root_0, string_literal47_tree); -@@ -988,11 +1038,10 @@ +@@ -988,11 +1038,10 @@ public class BstParser extends Parser { case 7 : // Bst.g:41:41: '*' { @@ -1307,12 +1309,12 @@ Index: BstParser.java - char_literal48=input.LT(1); - match(input,33,FOLLOW_33_in_function278); - char_literal48_tree = adaptor.create(char_literal48); -+ char_literal48=(Token)match(input,33,FOLLOW_33_in_function278); ++ char_literal48=(Token)match(input,33,FOLLOW_33_in_function278); + char_literal48_tree = (Object)adaptor.create(char_literal48); adaptor.addChild(root_0, char_literal48_tree); -@@ -1001,64 +1050,66 @@ +@@ -1001,64 +1050,66 @@ public class BstParser extends Parser { case 8 : // Bst.g:41:47: identifier { @@ -1325,9 +1327,9 @@ Index: BstParser.java - adaptor.addChild(root_0, identifier49.tree); + state._fsp--; - -+ adaptor.addChild(root_0, identifier49.getTree()); + ++ adaptor.addChild(root_0, identifier49.getTree()); + } break; @@ -1378,11 +1380,11 @@ Index: BstParser.java Token char_literal52=null; - stackitem_return stackitem51 = null; + BstParser.stackitem_return stackitem51 = null; ++ - List list_stackitem=new ArrayList(); - List list_26=new ArrayList(); - List list_25=new ArrayList(); -+ Object char_literal50_tree=null; Object char_literal52_tree=null; - @@ -1397,12 +1399,12 @@ Index: BstParser.java - char_literal50=input.LT(1); - match(input,25,FOLLOW_25_in_stack293); - list_25.add(char_literal50); -+ char_literal50=(Token)match(input,25,FOLLOW_25_in_stack293); ++ char_literal50=(Token)match(input,25,FOLLOW_25_in_stack293); + stream_25.add(char_literal50); // Bst.g:44:8: ( stackitem )+ int cnt6=0; -@@ -1066,6 +1117,7 @@ +@@ -1066,6 +1117,7 @@ public class BstParser extends Parser { do { int alt6=2; int LA6_0 = input.LA(1); @@ -1410,7 +1412,7 @@ Index: BstParser.java if ( (LA6_0==STRING||(LA6_0>=IDENTIFIER && LA6_0<=QUOTED)||LA6_0==25||(LA6_0>=27 && LA6_0<=33)) ) { alt6=1; } -@@ -1077,10 +1129,11 @@ +@@ -1077,9 +1129,10 @@ public class BstParser extends Parser { { pushFollow(FOLLOW_stackitem_in_stack295); stackitem51=stackitem(); @@ -1418,32 +1420,31 @@ Index: BstParser.java - list_stackitem.add(stackitem51.tree); + state._fsp--; - -+ stream_stackitem.add(stackitem51.getTree()); + ++ stream_stackitem.add(stackitem51.getTree()); + } break; - -@@ -1093,69 +1146,73 @@ +@@ -1093,69 +1146,73 @@ public class BstParser extends Parser { cnt6++; } while (true); - char_literal52=input.LT(1); - match(input,26,FOLLOW_26_in_stack298); - list_26.add(char_literal52); -+ char_literal52=(Token)match(input,26,FOLLOW_26_in_stack298); ++ char_literal52=(Token)match(input,26,FOLLOW_26_in_stack298); + stream_26.add(char_literal52); ++ -+ // AST REWRITE - int i_0 = 0; + // elements: stackitem -+ // token labels: ++ // token labels: + // rule labels: retval -+ // token list labels: -+ // rule list labels: -+ // wildcard labels: ++ // token list labels: ++ // rule list labels: ++ // wildcard labels: retval.tree = root_0; - root_0 = adaptor.nil(); + RewriteRuleSubtreeStream stream_retval=new RewriteRuleSubtreeStream(adaptor,"rule retval",retval!=null?retval.tree:null); @@ -1455,26 +1456,26 @@ Index: BstParser.java { - Object root_1 = adaptor.nil(); - root_1 = adaptor.becomeRoot(adaptor.create(STACK, "STACK"), root_1); -+ Object root_1 = (Object)adaptor.nil(); -+ root_1 = (Object)adaptor.becomeRoot((Object)adaptor.create(STACK, "STACK"), root_1); - +- - // Bst.g:44:34: ( stackitem )+ - { - int n_1 = list_stackitem == null ? 0 : list_stackitem.size(); - -+ if ( !(stream_stackitem.hasNext()) ) { -+ throw new RewriteEarlyExitException(); -+ } -+ while ( stream_stackitem.hasNext() ) { -+ adaptor.addChild(root_1, stream_stackitem.nextTree()); - +- - - if ( n_1==0 ) throw new RuntimeException("Must have more than one element for (...)+ loops"); - for (int i_1=0; i_1='A' && LA1_0<='Z')||(LA1_0>='a' && LA1_0<='z')) ) { alt1=1; } -@@ -693,82 +512,70 @@ +@@ -693,82 +512,70 @@ public class BstLexer extends Lexer { } @@ -2714,7 +2711,7 @@ Index: BstLexer.java } -@@ -783,51 +590,42 @@ +@@ -783,51 +590,42 @@ public class BstLexer extends Lexer { } @@ -2781,7 +2778,7 @@ Index: BstLexer.java } -@@ -841,6 +639,7 @@ +@@ -841,6 +639,7 @@ public class BstLexer extends Lexer { do { int alt4=2; int LA4_0 = input.LA(1); @@ -2789,7 +2786,7 @@ Index: BstLexer.java if ( ((LA4_0>='0' && LA4_0<='9')) ) { alt4=1; } -@@ -867,24 +666,18 @@ +@@ -867,24 +666,18 @@ public class BstLexer extends Lexer { } @@ -2821,7 +2818,7 @@ Index: BstLexer.java // Bst.g:80:4: ( '0' .. '9' ) { // Bst.g:80:4: ( '0' .. '9' ) -@@ -899,47 +692,42 @@ +@@ -899,47 +692,42 @@ public class BstLexer extends Lexer { } finally { @@ -2883,7 +2880,7 @@ Index: BstLexer.java } -@@ -954,59 +742,50 @@ +@@ -954,59 +742,50 @@ public class BstLexer extends Lexer { cnt5++; } while (true); @@ -2961,7 +2958,7 @@ Index: BstLexer.java } -@@ -1017,15 +796,16 @@ +@@ -1017,15 +796,16 @@ public class BstLexer extends Lexer { } } while (true); @@ -2980,7 +2977,7 @@ Index: BstLexer.java { match('\r'); -@@ -1035,619 +815,193 @@ +@@ -1035,619 +815,193 @@ public class BstLexer extends Lexer { } match('\n'); @@ -3439,7 +3436,7 @@ Index: BstLexer.java + // Bst.g:1:10: T__25 { - mT25(); -+ mT__25(); ++ mT__25(); } break; @@ -3448,7 +3445,7 @@ Index: BstLexer.java + // Bst.g:1:16: T__26 { - mT26(); -+ mT__26(); ++ mT__26(); } break; @@ -3457,7 +3454,7 @@ Index: BstLexer.java + // Bst.g:1:22: T__27 { - mT27(); -+ mT__27(); ++ mT__27(); } break; @@ -3466,7 +3463,7 @@ Index: BstLexer.java + // Bst.g:1:28: T__28 { - mT28(); -+ mT__28(); ++ mT__28(); } break; @@ -3475,7 +3472,7 @@ Index: BstLexer.java + // Bst.g:1:34: T__29 { - mT29(); -+ mT__29(); ++ mT__29(); } break; @@ -3484,7 +3481,7 @@ Index: BstLexer.java + // Bst.g:1:40: T__30 { - mT30(); -+ mT__30(); ++ mT__30(); } break; @@ -3493,7 +3490,7 @@ Index: BstLexer.java + // Bst.g:1:46: T__31 { - mT31(); -+ mT__31(); ++ mT__31(); } break; @@ -3502,7 +3499,7 @@ Index: BstLexer.java + // Bst.g:1:52: T__32 { - mT32(); -+ mT__32(); ++ mT__32(); } break; @@ -3511,7 +3508,7 @@ Index: BstLexer.java + // Bst.g:1:58: T__33 { - mT33(); -+ mT__33(); ++ mT__33(); } break; @@ -3641,7 +3638,7 @@ Index: BstLexer.java { mLINE_COMMENT(); -@@ -1659,6 +1013,167 @@ +@@ -1659,6 +1013,167 @@ public class BstLexer extends Lexer { } @@ -3811,9 +3808,7 @@ Index: BstLexer.java -} \ No newline at end of file +} -Index: Bst.g -=================================================================== ---- a/src/java/net/sf/jabref/bst/Bst.g +--- /dev/null +++ b/src/java/net/sf/jabref/bst/Bst.g @@ -0,0 +1,90 @@ +grammar Bst; @@ -3833,7 +3828,7 @@ Index: Bst.g + +program : commands+ -> ^(COMMANDS commands+); + -+commands ++commands + : STRINGS^ idList + | INTEGERS^ idList + | FUNCTION^ id stack @@ -3845,28 +3840,28 @@ Index: Bst.g + | ENTRY^ idList0 idList0 idList0 + | SORT^; + -+identifier ++identifier + : IDENTIFIER; + -+id ++id + : '{'! identifier '}'!; -+ -+idList ++ ++idList + : '{' identifier+ '}' -> ^(IDLIST identifier+); -+ -+idList0 ++ ++idList0 + : '{' identifier* '}' -> ^(IDLIST identifier*); + -+function ++function + : '<' | '>' | '=' | '+' | '-' | ':=' | '*' | identifier; -+ -+stack ++ ++stack + : '{' stackitem+ '}' -> ^(STACK stackitem+); -+ ++ +stackitem + : function -+ | STRING -+ | INTEGER ++ | STRING ++ | INTEGER + | QUOTED + | stack; + @@ -3892,17 +3887,17 @@ Index: Bst.g + +STRING + : '"' (~('"'))* '"'; -+ -+INTEGER ++ ++INTEGER + : '#' ('+'|'-')? NUMERAL+ ; + +fragment NUMERAL + : ('0'..'9'); -+ ++ +WS + : (' '|'\t'|'\n')+ {channel=99;} ; -+ ++ +LINE_COMMENT + : '%' ~('\n'|'\r')* '\r'? '\n' {channel=99;} + ; -+ ++ -- 2.20.1