diff options
author | Matthias Klose <doko@ubuntu.com> | 2008-10-21 15:18:44 +0000 |
---|---|---|
committer | Matthias Klose <doko@ubuntu.com> | 2008-10-21 15:18:44 +0000 |
commit | b3a091df41feaee9118fcdbe3bc64bbbe43cd3dd (patch) | |
tree | 742a117ca6042580934c64a796edbc9dc28c2405 | |
parent | cd611748684ccb79784cf533b0a98b224e0d7da9 (diff) |
libjava/ChangeLog:gcj/classpath-098-merge-branch
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* sources.am, Makfile.in: Regenerate.
libjava/classpath/ChangeLog:
2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr.m4:
Remove redundant checks.
* tools/Makefile.am:
Use gjdoc_gendir when calling antlr.
2008-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Remove superfluous AC_PROG_JAVA call.
libjava/classpath/ChangeLog.gcj:
2008-10-21 Matthias Klose <doko@ubuntu.com>
* classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ...
* classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here.
* Update .class files.
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Always generate parser in the srcdir.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcj/classpath-098-merge-branch@141265 138bc75d-0d04-0410-961f-82ee72b054a4
20 files changed, 2362 insertions, 2346 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7efb7e52824..7e0bf0bc48c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * sources.am, Makfile.in: Regenerate. + 2008-10-17 Matthias Klose <doko@ubuntu.com> * configure.ac: Fix bashisms. diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 42f865ef14a..a803fedb590 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -4327,6 +4327,7 @@ java/lang/Thread.java \ classpath/java/lang/ThreadDeath.java \ classpath/java/lang/ThreadGroup.java \ java/lang/ThreadLocal.java \ +classpath/java/lang/ThreadLocalMap.java \ classpath/java/lang/Throwable.java \ classpath/java/lang/TypeNotPresentException.java \ classpath/java/lang/UnknownError.java \ diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 81892591f40..f9db385f7c1 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,15 @@ +2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * m4/ac_prog_antlr.m4: + Remove redundant checks. + * tools/Makefile.am: + Use gjdoc_gendir when calling antlr. + +2008-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * configure.ac: + Remove superfluous AC_PROG_JAVA call. + 2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org> * m4/ac_prog_antlr: diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj index a46909af4ae..7e7c40a1c54 100644 --- a/libjava/classpath/ChangeLog.gcj +++ b/libjava/classpath/ChangeLog.gcj @@ -1,5 +1,16 @@ 2008-10-21 Matthias Klose <doko@ubuntu.com> + * classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ... + * classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here. + * Update .class files. + +2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * tools/Makefile.am: + Always generate parser in the srcdir. + +2008-10-21 Matthias Klose <doko@ubuntu.com> + * doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1. * doc/Makefile.in: Regenerate. diff --git a/libjava/classpath/configure b/libjava/classpath/configure index c20d6914321..5907cf80902 100755 --- a/libjava/classpath/configure +++ b/libjava/classpath/configure @@ -4920,7 +4920,7 @@ if test "${enable_regen_gjdoc_parser+set}" = set; then *) REGENERATE_GJDOC_PARSER=yes ;; esac else - if test -e ${srcdir}/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java; then + if test -e ${srcdir}/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java; then REGENERATE_GJDOC_PARSER=no ; else REGENERATE_GJDOC_PARSER=yes ; @@ -28984,7 +28984,7 @@ fi if test "x${TOOLSDIR}" != x; then - if test "x${COMPILE_WRAPPERS}" = xno && test "x${enable_java_maintainer_mode}" = xyes; then + if test "x${COMPILE_WRAPPERS}" = xno && test "x${enable_java_maintainer_mode}" = xyes; then if test "x$JAVAPREFIX" = x; then @@ -29373,7 +29373,28 @@ echo "${ECHO_T}$ac_cv_prog_java_works" >&6 fi if test "x${COMPILE_GJDOC}" = xyes; then - if test "$enable_java_maintainer_mode" = yes; then + + echo "$as_me:$LINENO: checking for the ANTLR parser generator JAR file" >&5 +echo $ECHO_N "checking for the ANTLR parser generator JAR file... $ECHO_C" >&6 + if test -z "$ANTLR_JAR"; then + for antlr_lib_home in `ls -d /usr/local/share/antlr* 2> /dev/null` \ + /usr/share/antlr/lib /usr/share/java /usr/lib; + do + if test -f "$antlr_lib_home/antlr.jar"; then + ANTLR_JAR="$antlr_lib_home/antlr.jar" + break + fi + done + fi + test -f $ANTLR_JAR || { { echo "$as_me:$LINENO: error: specified ANTLR jar file $ANTLR_JAR not found." >&5 +echo "$as_me: error: specified ANTLR jar file $ANTLR_JAR not found." >&2;} + { (exit 1); exit 1; }; } \ + && echo "$as_me:$LINENO: result: $ANTLR_JAR" >&5 +echo "${ECHO_T}$ANTLR_JAR" >&6 + + + if test "x${REGENERATE_GJDOC_PARSER}" = xyes; then + if test "x${enable_java_maintainer_mode}" = xyes; then if test "x$JAVAPREFIX" = x; then test "x$JAVA" = x && for ac_prog in cacao$EXEEXT jamvm$EXEEXT kaffe$EXEEXT gij$EXEEXT java$EXEEXT @@ -29519,7 +29540,7 @@ EOF if uudecode$EXEEXT Test.uue; then ac_cv_prog_uudecode_base64=yes else - echo "configure: 29522: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 29543: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -29666,7 +29687,7 @@ else JAVA_TEST=Object.java CLASS_TEST=Object.class cat << \EOF > $JAVA_TEST -/* #line 29669 "configure" */ +/* #line 29690 "configure" */ package java.lang; public class Object @@ -29715,7 +29736,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 29718 "configure" */ +/* [#]line 29739 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); @@ -29759,28 +29780,6 @@ echo "${ECHO_T}$ac_cv_prog_java_works" >&6 - fi - - echo "$as_me:$LINENO: checking for the ANTLR parser generator JAR file" >&5 -echo $ECHO_N "checking for the ANTLR parser generator JAR file... $ECHO_C" >&6 - if test -z "$ANTLR_JAR"; then - for antlr_lib_home in `ls -d /usr/local/share/antlr* 2> /dev/null` \ - /usr/share/antlr/lib /usr/share/java /usr/lib; - do - if test -f "$antlr_lib_home/antlr.jar"; then - ANTLR_JAR="$antlr_lib_home/antlr.jar" - break - fi - done - fi - test -f $ANTLR_JAR || { { echo "$as_me:$LINENO: error: specified ANTLR jar file $ANTLR_JAR not found." >&5 -echo "$as_me: error: specified ANTLR jar file $ANTLR_JAR not found." >&2;} - { (exit 1); exit 1; }; } \ - && echo "$as_me:$LINENO: result: $ANTLR_JAR" >&5 -echo "${ECHO_T}$ANTLR_JAR" >&6 - - - if test "x${REGENERATE_GJDOC_PARSER}" = xyes; then if test -n "$ac_tool_prefix"; then for ac_prog in cantlr runantlr antlr @@ -29886,23 +29885,17 @@ echo $ECHO_N "checking for antlr 2.7.1 or better... $ECHO_C" >&6 antlr_version_major=`echo $antlr_version_str | sed "$antlr_version_regex\\1/"` antlr_version_minor=`echo $antlr_version_str | sed "$antlr_version_regex\\2/"` antlr_version_micro=`echo $antlr_version_str | sed "$antlr_version_regex\\3/"` - (test $antlr_version_major -gt 2 || + (test $antlr_version_major -gt 2 || \ (test $antlr_version_major -eq 2 && \ test $antlr_version_minor -gt 7) || \ (test $antlr_version_major -eq 2 && \ test $antlr_version_minor -eq 7 && \ - test $antlr_version_micro -ge 1)) && \ - (test -z $ANTLR_JAR || \ - (test $antlr_version_major -gt $antlr_use_major || - (test $antlr_version_major -eq $antlr_use_major && \ - test $antlr_version_minor -gt $antlr_use_minor) || \ - (test $antlr_version_major -eq $antlr_use_major && \ - test $antlr_version_minor -eq $antlr_use_minor && \ - test $antlr_version_micro -ge $antlr_use_micro))) - fi - echo "$as_me:$LINENO: result: $antlr_use_major.$antlr_use_minor.$antlr_use_micro" >&5 -echo "${ECHO_T}$antlr_use_major.$antlr_use_minor.$antlr_use_micro" >&6 + test $antlr_version_micro -ge 1)) + fi + echo "$as_me:$LINENO: result: $antlr_version_major.$antlr_version_minor.$antlr_version_micro" >&5 +echo "${ECHO_T}$antlr_version_major.$antlr_version_minor.$antlr_version_micro" >&6 + fi fi fi fi @@ -30041,7 +30034,7 @@ else JAVA_TEST=Object.java CLASS_TEST=Object.class cat << \EOF > $JAVA_TEST -/* #line 30044 "configure" */ +/* #line 30037 "configure" */ package java.lang; public class Object @@ -30082,7 +30075,7 @@ fi JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST - /* #line 30085 "configure" */ + /* #line 30078 "configure" */ public class Test { public static void main(String args) diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac index dcc1ee9f36f..18311eab50a 100644 --- a/libjava/classpath/configure.ac +++ b/libjava/classpath/configure.ac @@ -387,7 +387,7 @@ AC_ARG_ENABLE([regen-gjdoc-parser], no) REGENERATE_GJDOC_PARSER=no ;; *) REGENERATE_GJDOC_PARSER=yes ;; esac], - [if test -e ${srcdir}/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java; then + [if test -e ${srcdir}/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java; then REGENERATE_GJDOC_PARSER=no ; else REGENERATE_GJDOC_PARSER=yes ; @@ -1015,18 +1015,18 @@ AM_CONDITIONAL(USE_PREBUILT_GLIBJ_ZIP, test x$use_glibj_zip = xtrue) AC_SUBST(PATH_TO_GLIBJ_ZIP) if test "x${TOOLSDIR}" != x; then - dnl GCJ LOCAL if test "x${COMPILE_WRAPPERS}" = xno && test "x${enable_java_maintainer_mode}" = xyes; then AC_PROG_JAVA fi if test "x${COMPILE_GJDOC}" = xyes; then - if test "$enable_java_maintainer_mode" = yes; then - AC_PROG_JAVA - fi - dnl END GCJ LOCAL AC_LIB_ANTLR if test "x${REGENERATE_GJDOC_PARSER}" = xyes; then +dnl GCJ LOCAL + if test "x${enable_java_maintainer_mode}" = xyes; then + AC_PROG_JAVA AC_PROG_ANTLR(2,7,1) + fi +dnl END GCJ LOCAL fi fi fi diff --git a/libjava/classpath/lib/gnu/java/locale/LocaleData.class b/libjava/classpath/lib/gnu/java/locale/LocaleData.class Binary files differindex ccee011a495..64d83fd1a9d 100644 --- a/libjava/classpath/lib/gnu/java/locale/LocaleData.class +++ b/libjava/classpath/lib/gnu/java/locale/LocaleData.class diff --git a/libjava/classpath/m4/ac_prog_antlr.m4 b/libjava/classpath/m4/ac_prog_antlr.m4 index d813fe15ccc..e2c10780ae3 100644 --- a/libjava/classpath/m4/ac_prog_antlr.m4 +++ b/libjava/classpath/m4/ac_prog_antlr.m4 @@ -35,19 +35,12 @@ AC_DEFUN([AC_PROG_ANTLR],[ antlr_version_major=`echo $antlr_version_str | sed "$antlr_version_regex\\1/"` antlr_version_minor=`echo $antlr_version_str | sed "$antlr_version_regex\\2/"` antlr_version_micro=`echo $antlr_version_str | sed "$antlr_version_regex\\3/"` - (test $antlr_version_major -gt $1 || + (test $antlr_version_major -gt $1 || \ (test $antlr_version_major -eq $1 && \ test $antlr_version_minor -gt $2) || \ (test $antlr_version_major -eq $1 && \ test $antlr_version_minor -eq $2 && \ - test $antlr_version_micro -ge $3)) && \ - (test -z $ANTLR_JAR || \ - (test $antlr_version_major -gt $antlr_use_major || - (test $antlr_version_major -eq $antlr_use_major && \ - test $antlr_version_minor -gt $antlr_use_minor) || \ - (test $antlr_version_major -eq $antlr_use_major && \ - test $antlr_version_minor -eq $antlr_use_minor && \ - test $antlr_version_micro -ge $antlr_use_micro))) - fi - AC_MSG_RESULT($antlr_use_major.$antlr_use_minor.$antlr_use_micro) + test $antlr_version_micro -ge $3)) + fi + AC_MSG_RESULT($antlr_version_major.$antlr_version_minor.$antlr_version_micro) ]) diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am index ca8067ea908..01c07ee9646 100755 --- a/libjava/classpath/tools/Makefile.am +++ b/libjava/classpath/tools/Makefile.am @@ -13,11 +13,13 @@ JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.5 -target 1.5 -encoding UTF-8 -boot endif if CREATE_GJDOC -if CREATE_GJDOC_PARSER -gjdoc_gendir = ${top_builddir}/tools/generated -else +## GCJ LOCAL: always put source files in srcdir +## if CREATE_GJDOC_PARSER +## gjdoc_gendir = ${top_builddir}/tools/generated +## else gjdoc_gendir = ${top_srcdir}/tools/generated -endif +## endif +## END GCJ LOCAL ANTLR_CLASSPATH = $(ANTLR_JAR):$(gjdoc_gendir) endif @@ -342,8 +344,8 @@ if JAVA_MAINTAINER_MODE if CREATE_GJDOC if CREATE_GJDOC_PARSER ## Generate antlr sources. - @mkdir_p@ $(srcdir)/gnu/classpath/tools/gjdoc/expr - $(ANTLR) -o $(srcdir)/gnu/classpath/tools/gjdoc/expr \ + @mkdir_p@ $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr + $(ANTLR) -o $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr \ $(srcdir)/gnu/classpath/tools/gjdoc/expr/java-expression.g endif endif diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in index 34adec96db1..cf52853cc32 100644 --- a/libjava/classpath/tools/Makefile.in +++ b/libjava/classpath/tools/Makefile.in @@ -453,8 +453,7 @@ GLIBJ_CLASSPATH = .:$(srcdir)/asm:$(ANTLR_CLASSPATH) # Setup the compiler to use the GNU Classpath library we just built. @GCJ_JAVAC_TRUE@JCOMPILER = $(JAVAC) $(JAVACFLAGS) -fsource=1.5 -ftarget=1.5 --encoding=UTF-8 --bootclasspath=$(GLIBJ_BOOTCLASSPATH) --classpath=$(GLIBJ_CLASSPATH) -@CREATE_GJDOC_PARSER_FALSE@@CREATE_GJDOC_TRUE@gjdoc_gendir = ${top_srcdir}/tools/generated -@CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@gjdoc_gendir = ${top_builddir}/tools/generated +@CREATE_GJDOC_TRUE@gjdoc_gendir = ${top_srcdir}/tools/generated @CREATE_GJDOC_TRUE@ANTLR_CLASSPATH = $(ANTLR_JAR):$(gjdoc_gendir) @CREATE_WRAPPERS_TRUE@bin_SCRIPTS = @CREATE_WRAPPERS_TRUE@AM_CPPFLAGS = -Wall \ @@ -1332,8 +1331,8 @@ $(TOOLS_ZIP): $(ALL_TOOLS_FILES) echo -n > vm-tools.lst; \ fi cat classes.lst asm.lst vm-tools.lst > all-classes.lst -@CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@@JAVA_MAINTAINER_MODE_TRUE@ @mkdir_p@ $(srcdir)/gnu/classpath/tools/gjdoc/expr -@CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@@JAVA_MAINTAINER_MODE_TRUE@ $(ANTLR) -o $(srcdir)/gnu/classpath/tools/gjdoc/expr \ +@CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@@JAVA_MAINTAINER_MODE_TRUE@ @mkdir_p@ $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr +@CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@@JAVA_MAINTAINER_MODE_TRUE@ $(ANTLR) -o $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr \ @CREATE_GJDOC_PARSER_TRUE@@CREATE_GJDOC_TRUE@@JAVA_MAINTAINER_MODE_TRUE@ $(srcdir)/gnu/classpath/tools/gjdoc/expr/java-expression.g @JAVA_MAINTAINER_MODE_TRUE@ AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \ @JAVA_MAINTAINER_MODE_TRUE@ $$AC -g -w -d $(srcdir)/asm @asm.lst diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/JavaLexer.class b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/JavaLexer.class Binary files differindex e5d4d8f5f06..a61433cb968 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/JavaLexer.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/gjdoc/expr/JavaLexer.class diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java index 98af239eef5..053f122f0b6 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java +++ b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java @@ -1,4 +1,4 @@ -// $ANTLR 2.7.7 (20080802): "java-expression.g" -> "JavaLexer.java"$ +// $ANTLR 2.7.7 (20080530): "java-expression.g" -> "JavaLexer.java"$ package gnu.classpath.tools.gjdoc.expr; @@ -43,21 +43,21 @@ public JavaLexer(LexerSharedInputState state) { setCaseSensitive(true); literals = new Hashtable(); literals.put(new ANTLRHashString("String", this), new Integer(55)); + literals.put(new ANTLRHashString("final", this), new Integer(39)); + literals.put(new ANTLRHashString("false", this), new Integer(84)); literals.put(new ANTLRHashString("true", this), new Integer(83)); literals.put(new ANTLRHashString("void", this), new Integer(46)); + literals.put(new ANTLRHashString("float", this), new Integer(52)); literals.put(new ANTLRHashString("boolean", this), new Integer(47)); - literals.put(new ANTLRHashString("abstract", this), new Integer(40)); - literals.put(new ANTLRHashString("short", this), new Integer(50)); literals.put(new ANTLRHashString("long", this), new Integer(53)); literals.put(new ANTLRHashString("null", this), new Integer(85)); + literals.put(new ANTLRHashString("short", this), new Integer(50)); literals.put(new ANTLRHashString("char", this), new Integer(49)); - literals.put(new ANTLRHashString("float", this), new Integer(52)); + literals.put(new ANTLRHashString("abstract", this), new Integer(40)); literals.put(new ANTLRHashString("byte", this), new Integer(48)); - literals.put(new ANTLRHashString("double", this), new Integer(54)); literals.put(new ANTLRHashString("int", this), new Integer(51)); + literals.put(new ANTLRHashString("double", this), new Integer(54)); literals.put(new ANTLRHashString("strictfp", this), new Integer(41)); - literals.put(new ANTLRHashString("false", this), new Integer(84)); - literals.put(new ANTLRHashString("final", this), new Integer(39)); } public Token nextToken() throws TokenStreamException { diff --git a/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap new file mode 100644 index 00000000000..045e3e308ea --- /dev/null +++ b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap @@ -0,0 +1,1280 @@ +SMAP +JavaLexer.java +G +*S G +*F ++ 0 java-expression.g +java-expression.g +*L +0:75 +0:81 +0:87 +0:93 +0:99 +0:105 +0:111 +0:117 +0:123 +0:129 +0:135 +0:142 +0:148 +0:154 +0:173 +0:181 +0:187 +0:191 +0:195 +0:199 +0:203 +0:207 +0:211 +0:215 +0:219 +0:223 +0:227 +0:231 +0:235 +0:239 +0:243 +0:247 +0:251 +0:255 +0:259 +0:263 +0:267 +0:271 +0:275 +0:279 +0:283 +0:287 +0:291 +0:295 +0:299 +0:303 +0:307 +0:311 +0:315 +0:319 +0:323 +0:327 +19:3 +231:355 +231:356 +231:357 +231:358 +231:360 +231:361 +231:362 +231:363 +231:364 +231:365 +231:366 +232:368 +232:369 +232:370 +232:371 +232:373 +232:374 +232:375 +232:376 +232:377 +232:378 +232:379 +233:381 +233:382 +233:383 +233:384 +233:386 +233:387 +233:388 +233:389 +233:390 +233:391 +233:392 +234:394 +234:395 +234:396 +234:397 +234:399 +234:400 +234:401 +234:402 +234:403 +234:404 +234:405 +235:407 +235:408 +235:409 +235:410 +235:412 +235:413 +235:414 +235:415 +235:416 +235:417 +235:418 +236:420 +236:421 +236:422 +236:423 +236:425 +236:426 +236:427 +236:428 +236:429 +236:430 +236:431 +237:433 +237:434 +237:435 +237:436 +237:438 +237:439 +237:440 +237:441 +237:442 +237:443 +237:444 +238:446 +238:447 +238:448 +238:449 +238:451 +238:452 +238:453 +238:454 +238:455 +238:456 +238:457 +239:459 +239:460 +239:461 +239:462 +239:464 +239:465 +239:466 +239:467 +239:468 +239:469 +239:470 +241:472 +241:473 +241:474 +241:475 +241:477 +241:478 +241:479 +241:480 +241:481 +241:482 +241:483 +242:485 +242:486 +242:487 +242:488 +242:490 +242:491 +242:492 +242:493 +242:494 +242:495 +242:496 +243:498 +243:499 +243:500 +243:501 +243:503 +243:504 +243:505 +243:506 +243:507 +243:508 +243:509 +244:511 +244:512 +244:513 +244:514 +244:516 +244:517 +244:518 +244:519 +244:520 +244:521 +244:522 +245:524 +245:525 +245:526 +245:527 +245:529 +245:530 +245:531 +245:532 +245:533 +245:534 +245:535 +246:537 +246:538 +246:539 +246:540 +246:542 +246:543 +246:544 +246:545 +246:546 +246:547 +246:548 +247:550 +247:551 +247:552 +247:553 +247:555 +247:556 +247:557 +247:558 +247:559 +247:560 +247:561 +248:563 +248:564 +248:565 +248:566 +248:568 +248:569 +248:570 +248:571 +248:572 +248:573 +248:574 +249:576 +249:577 +249:578 +249:579 +249:581 +249:582 +249:583 +249:584 +249:585 +249:586 +249:587 +250:589 +250:590 +250:591 +250:592 +250:594 +250:595 +250:596 +250:597 +250:598 +250:599 +250:600 +251:602 +251:603 +251:604 +251:605 +251:607 +251:608 +251:609 +251:610 +251:611 +251:612 +251:613 +252:615 +252:616 +252:617 +252:618 +252:620 +252:621 +252:622 +252:623 +252:624 +252:625 +252:626 +253:628 +253:629 +253:630 +253:631 +253:633 +253:634 +253:635 +253:636 +253:637 +253:638 +253:639 +254:641 +254:642 +254:643 +254:644 +254:646 +254:647 +254:648 +254:649 +254:650 +254:651 +254:652 +255:654 +255:655 +255:656 +255:657 +255:659 +255:660 +255:661 +255:662 +255:663 +255:664 +255:665 +256:667 +256:668 +256:669 +256:670 +256:672 +256:673 +256:674 +256:675 +256:676 +256:677 +256:678 +257:680 +257:681 +257:682 +257:683 +257:685 +257:686 +257:687 +257:688 +257:689 +257:690 +257:691 +258:693 +258:694 +258:695 +258:696 +258:698 +258:699 +258:700 +258:701 +258:702 +258:703 +258:704 +259:706 +259:707 +259:708 +259:709 +259:711 +259:712 +259:713 +259:714 +259:715 +259:716 +259:717 +260:719 +260:720 +260:721 +260:722 +260:724 +260:725 +260:726 +260:727 +260:728 +260:729 +260:730 +261:732 +261:733 +261:734 +261:735 +261:737 +261:738 +261:739 +261:740 +261:741 +261:742 +261:743 +262:745 +262:746 +262:747 +262:748 +262:750 +262:751 +262:752 +262:753 +262:754 +262:755 +262:756 +263:758 +263:759 +263:760 +263:761 +263:763 +263:764 +263:765 +263:766 +263:767 +263:768 +263:769 +264:771 +264:772 +264:773 +264:774 +264:776 +264:777 +264:778 +264:779 +264:780 +264:781 +264:782 +265:784 +265:785 +265:786 +265:787 +265:789 +265:790 +265:791 +265:792 +265:793 +265:794 +265:795 +266:797 +266:798 +266:799 +266:800 +266:802 +266:803 +266:804 +266:805 +266:806 +266:807 +266:808 +267:810 +267:811 +267:812 +267:813 +267:815 +267:816 +267:817 +267:818 +267:819 +267:820 +267:821 +268:823 +268:824 +268:825 +268:826 +268:828 +268:829 +268:830 +268:831 +268:832 +268:833 +268:834 +269:836 +269:837 +269:838 +269:839 +269:841 +269:842 +269:843 +269:844 +269:845 +269:846 +269:847 +270:849 +270:850 +270:851 +270:852 +270:854 +270:855 +270:856 +270:857 +270:858 +270:859 +270:860 +271:862 +271:863 +271:864 +271:865 +271:867 +271:868 +271:869 +271:870 +271:871 +271:872 +271:873 +272:875 +272:876 +272:877 +272:878 +272:880 +272:881 +272:882 +272:883 +272:884 +272:885 +272:886 +273:888 +273:889 +273:890 +273:891 +273:893 +273:894 +273:895 +273:896 +273:897 +273:898 +273:899 +274:901 +274:902 +274:903 +274:904 +274:906 +274:907 +274:908 +274:909 +274:910 +274:911 +274:912 +275:914 +275:915 +275:916 +275:917 +275:919 +275:920 +275:921 +275:922 +275:923 +275:924 +275:925 +276:927 +276:928 +276:929 +276:930 +276:932 +276:933 +276:934 +276:935 +276:936 +276:937 +276:938 +280:940 +280:941 +280:942 +280:943 +280:946 +280:947 +280:948 +280:949 +280:950 +280:951 +280:952 +280:987 +280:988 +280:989 +280:990 +280:991 +280:992 +280:993 +280:994 +280:998 +280:999 +280:1000 +280:1001 +280:1002 +280:1003 +281:955 +281:956 +281:957 +282:960 +282:961 +282:962 +284:965 +284:966 +284:970 +284:973 +284:976 +284:977 +284:978 +284:979 +285:968 +285:969 +286:971 +286:972 +287:974 +287:975 +289:982 +289:983 +291:995 +291:996 +295:1005 +295:1006 +295:1007 +295:1008 +295:1054 +295:1055 +295:1056 +295:1057 +295:1058 +295:1059 +296:1010 +297:1011 +297:1012 +297:1013 +297:1014 +297:1016 +297:1018 +297:1019 +297:1020 +297:1021 +297:1023 +297:1024 +297:1026 +297:1027 +297:1028 +297:1029 +297:1032 +297:1033 +297:1034 +297:1036 +297:1037 +297:1038 +297:1040 +297:1045 +297:1046 +297:1047 +297:1048 +297:1049 +298:1051 +298:1052 +302:1061 +302:1062 +302:1063 +302:1064 +302:1107 +302:1108 +302:1109 +302:1110 +302:1111 +302:1112 +303:1066 +304:1067 +304:1068 +304:1069 +304:1076 +304:1079 +304:1085 +304:1091 +304:1096 +304:1097 +304:1098 +304:1099 +304:1101 +304:1102 +315:1077 +315:1078 +316:1070 +316:1071 +316:1072 +316:1073 +316:1074 +317:1080 +317:1081 +317:1082 +317:1083 +318:1086 +318:1087 +318:1088 +318:1089 +319:1092 +319:1094 +321:1103 +322:1104 +322:1105 +327:1114 +327:1115 +327:1116 +327:1117 +327:1135 +327:1136 +327:1137 +327:1138 +327:1139 +327:1140 +328:1119 +328:1121 +328:1122 +328:1123 +328:1124 +328:1126 +328:1128 +328:1129 +328:1130 +328:1131 +328:1134 +332:1268 +332:1269 +332:1270 +332:1271 +332:1292 +332:1293 +332:1294 +332:1295 +332:1296 +332:1297 +333:1273 +333:1274 +333:1275 +333:1276 +333:1277 +333:1278 +333:1279 +333:1280 +333:1282 +333:1284 +333:1285 +333:1286 +333:1287 +333:1289 +333:1290 +333:1291 +346:1142 +346:1143 +346:1144 +346:1145 +346:1261 +346:1262 +346:1263 +346:1264 +346:1265 +346:1266 +347:1147 +348:1149 +348:1150 +348:1151 +348:1152 +348:1255 +348:1256 +348:1257 +348:1258 +348:1259 +349:1155 +349:1156 +349:1157 +350:1160 +350:1161 +350:1162 +351:1165 +351:1166 +351:1167 +352:1170 +352:1171 +352:1172 +353:1175 +353:1176 +353:1177 +354:1180 +354:1181 +354:1182 +355:1185 +355:1186 +355:1187 +356:1190 +356:1191 +356:1193 +356:1194 +356:1195 +356:1196 +356:1197 +356:1198 +356:1199 +356:1200 +356:1201 +356:1203 +356:1204 +356:1205 +356:1206 +356:1207 +356:1208 +356:1209 +357:1212 +357:1213 +357:1214 +358:1229 +358:1231 +358:1232 +358:1233 +358:1234 +362:1216 +362:1217 +363:1221 +363:1223 +363:1224 +363:1225 +363:1226 +367:1219 +367:1220 +370:1239 +370:1240 +370:1241 +371:1245 +371:1247 +371:1248 +371:1249 +371:1250 +375:1243 +375:1244 +383:1299 +383:1300 +383:1301 +383:1302 +383:1331 +383:1332 +383:1333 +383:1334 +383:1335 +383:1336 +384:1305 +384:1306 +384:1307 +384:1308 +384:1309 +384:1310 +384:1313 +384:1314 +384:1315 +384:1316 +384:1319 +384:1320 +384:1321 +384:1322 +384:1325 +384:1326 +384:1327 +384:1328 +384:1329 +391:1338 +391:1339 +391:1340 +391:1341 +391:1344 +391:1345 +391:1346 +391:1347 +391:1348 +391:1349 +392:1343 +399:1351 +399:1352 +399:1353 +399:1354 +399:1446 +399:1447 +399:1448 +399:1449 +399:1450 +399:1451 +399:1452 +401:1357 +401:1358 +401:1359 +401:1360 +401:1361 +401:1362 +401:1363 +401:1364 +401:1365 +401:1366 +401:1369 +401:1370 +401:1371 +401:1372 +401:1373 +401:1374 +401:1375 +401:1376 +401:1377 +401:1380 +401:1381 +401:1382 +401:1385 +401:1386 +401:1387 +401:1390 +401:1391 +401:1392 +401:1393 +401:1394 +401:1396 +401:1397 +401:1398 +401:1399 +401:1400 +401:1401 +401:1402 +401:1403 +401:1404 +401:1405 +401:1406 +401:1407 +401:1408 +401:1411 +401:1412 +401:1413 +401:1414 +401:1415 +401:1416 +401:1417 +401:1418 +401:1419 +401:1422 +401:1423 +401:1424 +401:1427 +401:1428 +401:1429 +401:1430 +401:1431 +401:1434 +401:1435 +401:1436 +401:1439 +401:1440 +401:1441 +401:1442 +401:1443 +401:1444 +401:1445 +406:1454 +406:1455 +406:1456 +406:1457 +406:1462 +406:1464 +406:1805 +406:1806 +406:1807 +406:1808 +406:1809 +406:1810 +406:1811 +406:1812 +406:1813 +406:1814 +406:1815 +408:1465 +408:1466 +408:1467 +408:1468 +408:1469 +409:1458 +409:1472 +409:1474 +409:1475 +409:1476 +409:1477 +409:1478 +409:1479 +409:1480 +409:1481 +409:1482 +409:1484 +409:1485 +409:1486 +409:1488 +409:1489 +409:1490 +409:1492 +409:1496 +409:1497 +409:1498 +409:1499 +409:1500 +409:1502 +409:1504 +409:1517 +409:1519 +410:1507 +411:1509 +412:1510 +413:1511 +414:1512 +415:1513 +416:1514 +420:1524 +420:1525 +420:1526 +420:1527 +420:1529 +420:1530 +420:1531 +420:1532 +420:1533 +420:1534 +420:1686 +420:1687 +420:1688 +420:1689 +420:1690 +421:1537 +421:1539 +421:1540 +421:1541 +421:1542 +421:1545 +421:1546 +421:1547 +421:1550 +421:1551 +421:1552 +421:1553 +421:1554 +421:1570 +421:1639 +421:1655 +421:1657 +421:1658 +422:1557 +422:1558 +422:1559 +422:1562 +422:1563 +422:1564 +422:1565 +422:1567 +422:1568 +422:1569 +431:1560 +431:1561 +435:1571 +435:1572 +435:1573 +435:1574 +435:1575 +435:1576 +435:1577 +435:1580 +435:1581 +435:1582 +435:1583 +435:1584 +435:1585 +435:1586 +435:1587 +435:1588 +435:1590 +435:1591 +435:1592 +435:1594 +435:1595 +435:1596 +435:1597 +435:1600 +435:1601 +435:1602 +435:1605 +435:1606 +435:1607 +435:1610 +435:1611 +435:1612 +435:1613 +435:1614 +435:1617 +435:1618 +435:1619 +435:1620 +435:1621 +435:1622 +435:1623 +435:1624 +435:1626 +435:1627 +435:1628 +435:1629 +435:1630 +435:1631 +435:1632 +435:1633 +435:1634 +435:1636 +435:1637 +435:1638 +437:1640 +437:1642 +437:1643 +437:1644 +437:1645 +437:1646 +437:1647 +437:1648 +437:1649 +437:1650 +437:1652 +437:1653 +437:1654 +439:1662 +439:1663 +439:1664 +439:1665 +439:1667 +439:1669 +439:1670 +439:1671 +439:1672 +439:1673 +439:1674 +439:1675 +439:1676 +439:1677 +439:1679 +439:1680 +439:1681 +439:1682 +441:1693 +441:1695 +441:1696 +441:1697 +441:1698 +441:1701 +441:1702 +441:1703 +441:1706 +441:1707 +441:1708 +441:1709 +441:1710 +441:1712 +441:1713 +441:1715 +441:1798 +441:1800 +445:1459 +445:1716 +445:1718 +445:1719 +445:1720 +445:1721 +445:1722 +445:1723 +445:1724 +445:1725 +445:1726 +445:1727 +445:1728 +445:1729 +445:1730 +445:1732 +445:1733 +445:1735 +445:1736 +445:1737 +445:1739 +445:1743 +445:1744 +445:1745 +445:1746 +445:1747 +445:1749 +445:1751 +445:1782 +445:1783 +445:1784 +445:1785 +445:1786 +446:1460 +446:1756 +446:1757 +446:1758 +446:1760 +446:1761 +446:1762 +446:1763 +446:1764 +446:1766 +446:1768 +447:1461 +447:1773 +447:1774 +447:1775 +447:1776 +447:1777 +447:1778 +449:1788 +450:1790 +451:1791 +452:1792 +453:1793 +454:1794 +455:1795 +463:1817 +463:1818 +463:1819 +463:1820 +463:1878 +463:1879 +463:1880 +463:1881 +463:1882 +463:1883 +464:1823 +464:1824 +464:1825 +464:1826 +464:1829 +464:1830 +464:1831 +464:1834 +464:1835 +464:1836 +464:1837 +464:1838 +464:1841 +464:1842 +464:1843 +464:1844 +464:1847 +464:1848 +464:1849 +464:1858 +464:1859 +464:1860 +464:1861 +464:1862 +464:1865 +464:1866 +464:1867 +464:1868 +464:1869 +464:1870 +464:1871 +464:1872 +464:1873 +464:1875 +464:1876 +464:1877 +469:1885 +469:1886 +469:1887 +469:1888 +469:1890 +469:1911 +469:1912 +469:1913 +469:1914 +469:1915 +469:1916 +469:1917 +469:1918 +469:1919 +469:1920 +469:1921 +470:1891 +470:1892 +470:1893 +470:1896 +470:1897 +470:1898 +470:1901 +470:1902 +470:1903 +470:1906 +470:1907 +470:1908 +*E diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java index 079dacd5611..9dfc9db38a5 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java +++ b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java @@ -1,4 +1,4 @@ -// $ANTLR 2.7.7 (20080802): "java-expression.g" -> "JavaRecognizer.java"$ +// $ANTLR 2.7.7 (20080530): "java-expression.g" -> "JavaRecognizer.java"$ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap new file mode 100644 index 00000000000..667caad55ff --- /dev/null +++ b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap @@ -0,0 +1,987 @@ +SMAP +JavaRecognizer.java +G +*S G +*F ++ 0 java-expression.g +java-expression.g +*L +19:3 +46:56 +46:57 +46:58 +46:59 +46:61 +46:62 +46:63 +46:101 +46:102 +46:103 +47:64 +47:65 +47:67 +47:68 +47:69 +47:70 +47:71 +47:72 +47:73 +47:74 +47:75 +47:76 +47:77 +47:78 +47:80 +47:81 +47:82 +47:83 +47:84 +47:86 +47:87 +48:88 +48:89 +48:95 +48:97 +48:98 +49:91 +49:100 +50:92 +51:93 +57:242 +57:243 +57:245 +57:246 +57:247 +57:252 +57:253 +57:254 +58:249 +58:250 +58:251 +62:105 +62:106 +62:108 +62:109 +62:110 +62:112 +62:233 +62:234 +62:235 +62:236 +62:237 +62:238 +62:239 +62:240 +63:113 +63:114 +63:115 +63:116 +63:117 +63:118 +63:119 +63:120 +64:125 +64:126 +64:127 +64:128 +64:129 +64:130 +64:131 +64:132 +65:137 +65:138 +65:139 +65:140 +65:141 +65:142 +65:143 +65:144 +66:122 +66:149 +66:150 +66:151 +66:152 +66:153 +66:154 +66:155 +66:156 +67:134 +67:161 +67:162 +67:163 +67:164 +67:165 +67:166 +67:167 +67:168 +68:146 +68:173 +68:174 +68:175 +68:176 +68:177 +68:178 +68:179 +68:180 +69:158 +69:185 +69:186 +69:187 +69:188 +69:189 +69:190 +69:191 +69:192 +70:170 +70:197 +70:198 +70:199 +70:200 +70:201 +70:202 +70:203 +70:204 +71:182 +71:209 +71:210 +71:211 +71:212 +71:213 +71:214 +71:215 +71:216 +72:194 +72:221 +72:222 +72:223 +72:224 +72:225 +72:226 +72:227 +72:228 +73:206 +74:218 +75:230 +77:256 +77:257 +77:259 +77:260 +77:261 +77:297 +77:298 +77:299 +78:262 +78:263 +78:264 +78:265 +78:267 +78:268 +78:269 +78:270 +78:271 +78:272 +78:274 +78:275 +78:276 +78:277 +78:278 +78:279 +78:280 +78:281 +78:282 +78:283 +78:284 +78:285 +78:286 +78:287 +78:289 +78:290 +78:291 +78:292 +78:294 +78:295 +78:296 +81:301 +81:302 +81:304 +81:305 +81:306 +81:312 +81:313 +81:314 +82:308 +82:309 +82:310 +84:311 +86:316 +86:317 +86:319 +86:320 +86:321 +86:322 +86:357 +86:358 +86:359 +87:324 +87:325 +88:327 +88:328 +88:329 +88:330 +88:331 +88:332 +88:333 +88:334 +88:335 +88:336 +88:337 +88:338 +88:339 +88:340 +88:350 +88:351 +88:352 +88:353 +88:354 +89:356 +93:361 +93:362 +93:364 +93:365 +93:366 +93:367 +93:392 +93:393 +93:394 +94:369 +94:370 +94:371 +94:372 +94:373 +94:374 +94:375 +94:376 +94:377 +94:378 +94:379 +94:380 +94:381 +94:382 +94:384 +94:385 +94:386 +94:387 +94:389 +94:390 +94:391 +99:396 +99:397 +99:399 +99:400 +99:401 +99:402 +99:427 +99:428 +99:429 +100:404 +100:405 +100:406 +100:407 +100:408 +100:409 +100:410 +100:411 +100:412 +100:413 +100:414 +100:415 +100:416 +100:417 +100:419 +100:420 +100:421 +100:422 +100:424 +100:425 +100:426 +105:431 +105:432 +105:434 +105:435 +105:436 +105:437 +105:462 +105:463 +105:464 +106:439 +106:440 +106:441 +106:442 +106:443 +106:444 +106:445 +106:446 +106:447 +106:448 +106:449 +106:450 +106:451 +106:452 +106:454 +106:455 +106:456 +106:457 +106:459 +106:460 +106:461 +111:466 +111:467 +111:469 +111:470 +111:471 +111:472 +111:497 +111:498 +111:499 +112:474 +112:475 +112:476 +112:477 +112:478 +112:479 +112:480 +112:481 +112:482 +112:483 +112:484 +112:485 +112:486 +112:487 +112:489 +112:490 +112:491 +112:492 +112:494 +112:495 +112:496 +117:501 +117:502 +117:504 +117:505 +117:506 +117:507 +117:532 +117:533 +117:534 +118:509 +118:510 +118:511 +118:512 +118:513 +118:514 +118:515 +118:516 +118:517 +118:518 +118:519 +118:520 +118:521 +118:522 +118:524 +118:525 +118:526 +118:527 +118:529 +118:530 +118:531 +123:536 +123:537 +123:539 +123:540 +123:541 +123:542 +123:592 +123:593 +123:594 +124:544 +124:545 +124:546 +124:547 +124:548 +124:549 +124:551 +124:552 +124:553 +124:554 +124:555 +124:556 +124:557 +124:558 +124:559 +124:560 +124:561 +124:565 +124:566 +124:567 +124:568 +124:569 +124:570 +124:571 +124:572 +124:573 +124:574 +124:578 +124:579 +124:580 +124:581 +124:582 +124:584 +124:585 +124:586 +124:587 +124:589 +124:590 +124:591 +129:596 +129:597 +129:599 +129:600 +129:601 +129:602 +129:680 +129:681 +129:682 +130:604 +130:605 +131:607 +131:608 +131:609 +131:610 +131:612 +131:613 +131:614 +131:615 +131:616 +131:617 +131:618 +131:619 +131:620 +131:621 +131:622 +131:665 +131:666 +131:667 +131:668 +131:669 +131:671 +131:672 +131:673 +131:674 +131:676 +131:677 +132:626 +132:627 +132:628 +132:629 +132:630 +132:631 +132:632 +132:633 +132:634 +132:635 +132:679 +133:639 +133:640 +133:641 +133:642 +133:643 +133:644 +133:645 +133:646 +133:647 +133:648 +134:652 +134:653 +134:654 +134:655 +134:656 +134:657 +134:658 +134:659 +134:660 +134:661 +143:684 +143:685 +143:687 +143:688 +143:689 +143:690 +143:753 +143:754 +143:755 +144:692 +144:693 +144:694 +144:695 +144:696 +144:697 +144:699 +144:700 +144:701 +144:702 +144:703 +144:704 +144:705 +144:706 +144:707 +144:708 +144:709 +144:713 +144:714 +144:715 +144:716 +144:717 +144:718 +144:719 +144:720 +144:721 +144:722 +144:726 +144:727 +144:728 +144:729 +144:730 +144:731 +144:732 +144:733 +144:734 +144:735 +144:739 +144:740 +144:741 +144:742 +144:743 +144:745 +144:746 +144:747 +144:748 +144:750 +144:751 +144:752 +149:757 +149:758 +149:760 +149:761 +149:762 +149:763 +149:813 +149:814 +149:815 +150:765 +150:766 +150:767 +150:768 +150:769 +150:770 +150:772 +150:773 +150:774 +150:775 +150:776 +150:777 +150:778 +150:779 +150:780 +150:781 +150:782 +150:786 +150:787 +150:788 +150:789 +150:790 +150:791 +150:792 +150:793 +150:794 +150:795 +150:799 +150:800 +150:801 +150:802 +150:803 +150:805 +150:806 +150:807 +150:808 +150:810 +150:811 +150:812 +155:817 +155:818 +155:820 +155:821 +155:822 +155:823 +155:886 +155:887 +155:888 +156:825 +156:826 +156:827 +156:828 +156:829 +156:830 +156:832 +156:833 +156:834 +156:835 +156:836 +156:837 +156:838 +156:839 +156:840 +156:841 +156:842 +156:846 +156:847 +156:848 +156:849 +156:850 +156:851 +156:852 +156:853 +156:854 +156:855 +156:859 +156:860 +156:861 +156:862 +156:863 +156:864 +156:865 +156:866 +156:867 +156:868 +156:872 +156:873 +156:874 +156:875 +156:876 +156:878 +156:879 +156:880 +156:881 +156:883 +156:884 +156:885 +160:890 +160:891 +160:893 +160:894 +160:895 +160:896 +160:898 +160:949 +160:950 +160:951 +160:952 +160:953 +160:954 +160:955 +160:956 +161:899 +161:900 +161:901 +161:902 +161:903 +161:904 +161:905 +161:906 +161:908 +161:909 +161:910 +161:911 +162:916 +162:917 +162:918 +162:919 +162:920 +162:921 +162:922 +162:923 +162:925 +162:926 +162:927 +163:930 +163:931 +163:932 +163:933 +163:934 +163:935 +163:936 +163:937 +163:938 +163:939 +163:940 +163:941 +163:942 +163:943 +163:944 +163:945 +163:946 +164:913 +166:958 +166:959 +166:961 +166:962 +166:963 +166:966 +166:968 +166:997 +166:1033 +166:1038 +166:1039 +166:1040 +166:1041 +166:1042 +166:1043 +166:1044 +166:1045 +167:969 +167:970 +167:971 +167:972 +167:973 +167:974 +167:975 +167:976 +167:977 +167:978 +168:983 +168:984 +168:985 +168:986 +168:987 +168:988 +168:989 +168:990 +168:991 +168:992 +170:980 +171:994 +171:998 +171:999 +171:1000 +171:1001 +171:1002 +171:1003 +171:1005 +171:1006 +171:1007 +171:1009 +171:1010 +171:1011 +171:1012 +171:1013 +171:1014 +171:1015 +171:1016 +172:964 +172:965 +172:1017 +172:1018 +172:1019 +172:1020 +172:1021 +172:1022 +172:1024 +172:1025 +172:1026 +173:1027 +173:1028 +173:1029 +173:1030 +175:1034 +175:1035 +175:1036 +175:1037 +176:1032 +179:1047 +179:1048 +179:1050 +179:1051 +179:1052 +179:1054 +179:1122 +179:1123 +179:1124 +179:1125 +179:1126 +179:1127 +179:1128 +179:1129 +180:1055 +180:1056 +180:1057 +180:1058 +180:1059 +180:1060 +180:1061 +180:1062 +180:1063 +180:1064 +181:1067 +181:1068 +181:1069 +181:1070 +181:1071 +181:1072 +182:1077 +182:1078 +182:1079 +182:1080 +182:1081 +182:1082 +182:1083 +182:1084 +183:1089 +183:1090 +183:1091 +183:1092 +183:1093 +183:1094 +183:1095 +183:1096 +184:1074 +184:1101 +184:1102 +184:1103 +184:1104 +184:1105 +184:1106 +184:1107 +184:1108 +185:1086 +185:1113 +185:1114 +185:1115 +185:1116 +185:1117 +185:1118 +186:1098 +187:1110 +187:1119 +190:1232 +190:1234 +190:1235 +190:1237 +190:1238 +190:1239 +190:1265 +190:1266 +190:1267 +191:1233 +191:1241 +191:1242 +191:1243 +191:1244 +192:1245 +192:1246 +192:1247 +192:1257 +192:1258 +192:1259 +192:1260 +192:1262 +192:1263 +192:1264 +198:1248 +198:1249 +198:1250 +198:1251 +198:1252 +198:1253 +198:1254 +198:1255 +198:1256 +202:1131 +202:1132 +202:1134 +202:1135 +202:1136 +202:1150 +202:1223 +202:1224 +202:1225 +202:1226 +202:1227 +202:1228 +202:1229 +202:1230 +203:1137 +203:1138 +203:1151 +203:1152 +203:1153 +203:1154 +203:1155 +203:1156 +203:1157 +203:1158 +204:1139 +204:1140 +204:1163 +204:1164 +204:1165 +204:1166 +204:1167 +204:1168 +204:1169 +204:1170 +205:1141 +205:1142 +205:1175 +205:1176 +205:1177 +205:1178 +205:1179 +205:1180 +205:1181 +205:1182 +206:1143 +206:1144 +206:1160 +206:1187 +206:1188 +206:1189 +206:1190 +206:1191 +206:1192 +206:1193 +206:1194 +207:1145 +207:1146 +207:1172 +207:1199 +207:1200 +207:1201 +207:1202 +207:1203 +207:1204 +207:1205 +207:1206 +208:1147 +208:1148 +208:1184 +208:1211 +208:1212 +208:1213 +208:1214 +208:1215 +208:1216 +208:1217 +208:1218 +209:1196 +210:1208 +211:1220 +*E diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java index 7a35323da86..2962388f402 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java +++ b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java @@ -1,4 +1,4 @@ -// $ANTLR 2.7.7 (20080802): "java-expression.g" -> "JavaLexer.java"$ +// $ANTLR 2.7.7 (20080530): "java-expression.g" -> "JavaLexer.java"$ package gnu.classpath.tools.gjdoc.expr; diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt index f6bc7a51b4b..b9983e22f48 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt +++ b/libjava/classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt @@ -1,4 +1,4 @@ -// $ANTLR 2.7.7 (20080802): java-expression.g -> JavaTokenTypes.txt$ +// $ANTLR 2.7.7 (20080530): java-expression.g -> JavaTokenTypes.txt$ Java // output token vocab name BLOCK=4 MODIFIERS=5 diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap deleted file mode 100644 index 09899cc37f3..00000000000 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap +++ /dev/null @@ -1,1280 +0,0 @@ -SMAP -JavaLexer.java -G -*S G -*F -+ 0 java-expression.g -java-expression.g -*L -0:147 -0:159 -0:171 -0:183 -0:195 -0:207 -0:219 -0:231 -0:243 -0:255 -0:267 -0:281 -0:293 -0:305 -0:343 -0:359 -0:371 -0:379 -0:387 -0:395 -0:403 -0:411 -0:419 -0:427 -0:435 -0:443 -0:451 -0:459 -0:467 -0:475 -0:483 -0:491 -0:499 -0:507 -0:515 -0:523 -0:531 -0:539 -0:547 -0:555 -0:563 -0:571 -0:579 -0:587 -0:595 -0:603 -0:611 -0:619 -0:627 -0:635 -0:643 -0:651 -19:4 -231:706 -231:708 -231:710 -231:712 -231:716 -231:718 -231:720 -231:722 -231:724 -231:726 -231:728 -232:732 -232:734 -232:736 -232:738 -232:742 -232:744 -232:746 -232:748 -232:750 -232:752 -232:754 -233:758 -233:760 -233:762 -233:764 -233:768 -233:770 -233:772 -233:774 -233:776 -233:778 -233:780 -234:784 -234:786 -234:788 -234:790 -234:794 -234:796 -234:798 -234:800 -234:802 -234:804 -234:806 -235:810 -235:812 -235:814 -235:816 -235:820 -235:822 -235:824 -235:826 -235:828 -235:830 -235:832 -236:836 -236:838 -236:840 -236:842 -236:846 -236:848 -236:850 -236:852 -236:854 -236:856 -236:858 -237:862 -237:864 -237:866 -237:868 -237:872 -237:874 -237:876 -237:878 -237:880 -237:882 -237:884 -238:888 -238:890 -238:892 -238:894 -238:898 -238:900 -238:902 -238:904 -238:906 -238:908 -238:910 -239:914 -239:916 -239:918 -239:920 -239:924 -239:926 -239:928 -239:930 -239:932 -239:934 -239:936 -241:940 -241:942 -241:944 -241:946 -241:950 -241:952 -241:954 -241:956 -241:958 -241:960 -241:962 -242:966 -242:968 -242:970 -242:972 -242:976 -242:978 -242:980 -242:982 -242:984 -242:986 -242:988 -243:992 -243:994 -243:996 -243:998 -243:1002 -243:1004 -243:1006 -243:1008 -243:1010 -243:1012 -243:1014 -244:1018 -244:1020 -244:1022 -244:1024 -244:1028 -244:1030 -244:1032 -244:1034 -244:1036 -244:1038 -244:1040 -245:1044 -245:1046 -245:1048 -245:1050 -245:1054 -245:1056 -245:1058 -245:1060 -245:1062 -245:1064 -245:1066 -246:1070 -246:1072 -246:1074 -246:1076 -246:1080 -246:1082 -246:1084 -246:1086 -246:1088 -246:1090 -246:1092 -247:1096 -247:1098 -247:1100 -247:1102 -247:1106 -247:1108 -247:1110 -247:1112 -247:1114 -247:1116 -247:1118 -248:1122 -248:1124 -248:1126 -248:1128 -248:1132 -248:1134 -248:1136 -248:1138 -248:1140 -248:1142 -248:1144 -249:1148 -249:1150 -249:1152 -249:1154 -249:1158 -249:1160 -249:1162 -249:1164 -249:1166 -249:1168 -249:1170 -250:1174 -250:1176 -250:1178 -250:1180 -250:1184 -250:1186 -250:1188 -250:1190 -250:1192 -250:1194 -250:1196 -251:1200 -251:1202 -251:1204 -251:1206 -251:1210 -251:1212 -251:1214 -251:1216 -251:1218 -251:1220 -251:1222 -252:1226 -252:1228 -252:1230 -252:1232 -252:1236 -252:1238 -252:1240 -252:1242 -252:1244 -252:1246 -252:1248 -253:1252 -253:1254 -253:1256 -253:1258 -253:1262 -253:1264 -253:1266 -253:1268 -253:1270 -253:1272 -253:1274 -254:1278 -254:1280 -254:1282 -254:1284 -254:1288 -254:1290 -254:1292 -254:1294 -254:1296 -254:1298 -254:1300 -255:1304 -255:1306 -255:1308 -255:1310 -255:1314 -255:1316 -255:1318 -255:1320 -255:1322 -255:1324 -255:1326 -256:1330 -256:1332 -256:1334 -256:1336 -256:1340 -256:1342 -256:1344 -256:1346 -256:1348 -256:1350 -256:1352 -257:1356 -257:1358 -257:1360 -257:1362 -257:1366 -257:1368 -257:1370 -257:1372 -257:1374 -257:1376 -257:1378 -258:1382 -258:1384 -258:1386 -258:1388 -258:1392 -258:1394 -258:1396 -258:1398 -258:1400 -258:1402 -258:1404 -259:1408 -259:1410 -259:1412 -259:1414 -259:1418 -259:1420 -259:1422 -259:1424 -259:1426 -259:1428 -259:1430 -260:1434 -260:1436 -260:1438 -260:1440 -260:1444 -260:1446 -260:1448 -260:1450 -260:1452 -260:1454 -260:1456 -261:1460 -261:1462 -261:1464 -261:1466 -261:1470 -261:1472 -261:1474 -261:1476 -261:1478 -261:1480 -261:1482 -262:1486 -262:1488 -262:1490 -262:1492 -262:1496 -262:1498 -262:1500 -262:1502 -262:1504 -262:1506 -262:1508 -263:1512 -263:1514 -263:1516 -263:1518 -263:1522 -263:1524 -263:1526 -263:1528 -263:1530 -263:1532 -263:1534 -264:1538 -264:1540 -264:1542 -264:1544 -264:1548 -264:1550 -264:1552 -264:1554 -264:1556 -264:1558 -264:1560 -265:1564 -265:1566 -265:1568 -265:1570 -265:1574 -265:1576 -265:1578 -265:1580 -265:1582 -265:1584 -265:1586 -266:1590 -266:1592 -266:1594 -266:1596 -266:1600 -266:1602 -266:1604 -266:1606 -266:1608 -266:1610 -266:1612 -267:1616 -267:1618 -267:1620 -267:1622 -267:1626 -267:1628 -267:1630 -267:1632 -267:1634 -267:1636 -267:1638 -268:1642 -268:1644 -268:1646 -268:1648 -268:1652 -268:1654 -268:1656 -268:1658 -268:1660 -268:1662 -268:1664 -269:1668 -269:1670 -269:1672 -269:1674 -269:1678 -269:1680 -269:1682 -269:1684 -269:1686 -269:1688 -269:1690 -270:1694 -270:1696 -270:1698 -270:1700 -270:1704 -270:1706 -270:1708 -270:1710 -270:1712 -270:1714 -270:1716 -271:1720 -271:1722 -271:1724 -271:1726 -271:1730 -271:1732 -271:1734 -271:1736 -271:1738 -271:1740 -271:1742 -272:1746 -272:1748 -272:1750 -272:1752 -272:1756 -272:1758 -272:1760 -272:1762 -272:1764 -272:1766 -272:1768 -273:1772 -273:1774 -273:1776 -273:1778 -273:1782 -273:1784 -273:1786 -273:1788 -273:1790 -273:1792 -273:1794 -274:1798 -274:1800 -274:1802 -274:1804 -274:1808 -274:1810 -274:1812 -274:1814 -274:1816 -274:1818 -274:1820 -275:1824 -275:1826 -275:1828 -275:1830 -275:1834 -275:1836 -275:1838 -275:1840 -275:1842 -275:1844 -275:1846 -276:1850 -276:1852 -276:1854 -276:1856 -276:1860 -276:1862 -276:1864 -276:1866 -276:1868 -276:1870 -276:1872 -280:1876 -280:1878 -280:1880 -280:1882 -280:1888 -280:1890 -280:1892 -280:1894 -280:1896 -280:1898 -280:1900 -280:1970 -280:1972 -280:1974 -280:1976 -280:1978 -280:1980 -280:1982 -280:1984 -280:1992 -280:1994 -280:1996 -280:1998 -280:2000 -280:2002 -281:1906 -281:1908 -281:1910 -282:1916 -282:1918 -282:1920 -284:1926 -284:1928 -284:1936 -284:1942 -284:1948 -284:1950 -284:1952 -284:1954 -285:1932 -285:1934 -286:1938 -286:1940 -287:1944 -287:1946 -289:1960 -289:1962 -291:1986 -291:1988 -295:2006 -295:2008 -295:2010 -295:2012 -295:2104 -295:2106 -295:2108 -295:2110 -295:2112 -295:2114 -296:2016 -297:2018 -297:2020 -297:2022 -297:2024 -297:2028 -297:2032 -297:2034 -297:2036 -297:2038 -297:2042 -297:2044 -297:2048 -297:2050 -297:2052 -297:2054 -297:2060 -297:2062 -297:2064 -297:2068 -297:2070 -297:2072 -297:2076 -297:2086 -297:2088 -297:2090 -297:2092 -297:2094 -298:2098 -298:2100 -302:2118 -302:2120 -302:2122 -302:2124 -302:2210 -302:2212 -302:2214 -302:2216 -302:2218 -302:2220 -303:2128 -304:2130 -304:2132 -304:2134 -304:2148 -304:2154 -304:2166 -304:2178 -304:2188 -304:2190 -304:2192 -304:2194 -304:2198 -304:2200 -315:2150 -315:2152 -316:2136 -316:2138 -316:2140 -316:2142 -316:2144 -317:2156 -317:2158 -317:2160 -317:2162 -318:2168 -318:2170 -318:2172 -318:2174 -319:2180 -319:2184 -321:2202 -322:2204 -322:2206 -327:2224 -327:2226 -327:2228 -327:2230 -327:2266 -327:2268 -327:2270 -327:2272 -327:2274 -327:2276 -328:2234 -328:2238 -328:2240 -328:2242 -328:2244 -328:2248 -328:2252 -328:2254 -328:2256 -328:2258 -328:2264 -332:2532 -332:2534 -332:2536 -332:2538 -332:2580 -332:2582 -332:2584 -332:2586 -332:2588 -332:2590 -333:2542 -333:2544 -333:2546 -333:2548 -333:2550 -333:2552 -333:2554 -333:2556 -333:2560 -333:2564 -333:2566 -333:2568 -333:2570 -333:2574 -333:2576 -333:2578 -346:2280 -346:2282 -346:2284 -346:2286 -346:2518 -346:2520 -346:2522 -346:2524 -346:2526 -346:2528 -347:2290 -348:2294 -348:2296 -348:2298 -348:2300 -348:2506 -348:2508 -348:2510 -348:2512 -348:2514 -349:2306 -349:2308 -349:2310 -350:2316 -350:2318 -350:2320 -351:2326 -351:2328 -351:2330 -352:2336 -352:2338 -352:2340 -353:2346 -353:2348 -353:2350 -354:2356 -354:2358 -354:2360 -355:2366 -355:2368 -355:2370 -356:2376 -356:2378 -356:2382 -356:2384 -356:2386 -356:2388 -356:2390 -356:2392 -356:2394 -356:2396 -356:2398 -356:2402 -356:2404 -356:2406 -356:2408 -356:2410 -356:2412 -356:2414 -357:2420 -357:2422 -357:2424 -358:2454 -358:2458 -358:2460 -358:2462 -358:2464 -362:2428 -362:2430 -363:2438 -363:2442 -363:2444 -363:2446 -363:2448 -367:2434 -367:2436 -370:2474 -370:2476 -370:2478 -371:2486 -371:2490 -371:2492 -371:2494 -371:2496 -375:2482 -375:2484 -383:2594 -383:2596 -383:2598 -383:2600 -383:2658 -383:2660 -383:2662 -383:2664 -383:2666 -383:2668 -384:2606 -384:2608 -384:2610 -384:2612 -384:2614 -384:2616 -384:2622 -384:2624 -384:2626 -384:2628 -384:2634 -384:2636 -384:2638 -384:2640 -384:2646 -384:2648 -384:2650 -384:2652 -384:2654 -391:2672 -391:2674 -391:2676 -391:2678 -391:2684 -391:2686 -391:2688 -391:2690 -391:2692 -391:2694 -392:2682 -399:2698 -399:2700 -399:2702 -399:2704 -399:2888 -399:2890 -399:2892 -399:2894 -399:2896 -399:2898 -399:2900 -401:2710 -401:2712 -401:2714 -401:2716 -401:2718 -401:2720 -401:2722 -401:2724 -401:2726 -401:2728 -401:2734 -401:2736 -401:2738 -401:2740 -401:2742 -401:2744 -401:2746 -401:2748 -401:2750 -401:2756 -401:2758 -401:2760 -401:2766 -401:2768 -401:2770 -401:2776 -401:2778 -401:2780 -401:2782 -401:2784 -401:2788 -401:2790 -401:2792 -401:2794 -401:2796 -401:2798 -401:2800 -401:2802 -401:2804 -401:2806 -401:2808 -401:2810 -401:2812 -401:2818 -401:2820 -401:2822 -401:2824 -401:2826 -401:2828 -401:2830 -401:2832 -401:2834 -401:2840 -401:2842 -401:2844 -401:2850 -401:2852 -401:2854 -401:2856 -401:2858 -401:2864 -401:2866 -401:2868 -401:2874 -401:2876 -401:2878 -401:2880 -401:2882 -401:2884 -401:2886 -406:2904 -406:2906 -406:2908 -406:2910 -406:2920 -406:2924 -406:3606 -406:3608 -406:3610 -406:3612 -406:3614 -406:3616 -406:3618 -406:3620 -406:3622 -406:3624 -406:3626 -408:2926 -408:2928 -408:2930 -408:2932 -408:2934 -409:2912 -409:2940 -409:2944 -409:2946 -409:2948 -409:2950 -409:2952 -409:2954 -409:2956 -409:2958 -409:2960 -409:2964 -409:2966 -409:2968 -409:2972 -409:2974 -409:2976 -409:2980 -409:2988 -409:2990 -409:2992 -409:2994 -409:2996 -409:3000 -409:3004 -409:3030 -409:3034 -410:3010 -412:3014 -414:3016 -416:3018 -418:3020 -420:3022 -420:3044 -420:3046 -420:3048 -420:3050 -420:3054 -420:3056 -420:3058 -420:3060 -420:3062 -420:3064 -420:3368 -420:3370 -420:3372 -420:3374 -420:3376 -421:3070 -421:3074 -421:3076 -421:3078 -421:3080 -421:3086 -421:3088 -421:3090 -421:3096 -421:3098 -421:3100 -421:3102 -421:3104 -421:3136 -421:3274 -421:3306 -421:3310 -421:3312 -422:3024 -422:3110 -422:3112 -422:3114 -422:3120 -422:3122 -422:3124 -422:3126 -422:3130 -422:3132 -422:3134 -431:3116 -431:3118 -435:3138 -435:3140 -435:3142 -435:3144 -435:3146 -435:3148 -435:3150 -435:3156 -435:3158 -435:3160 -435:3162 -435:3164 -435:3166 -435:3168 -435:3170 -435:3172 -435:3176 -435:3178 -435:3180 -435:3184 -435:3186 -435:3188 -435:3190 -435:3196 -435:3198 -435:3200 -435:3206 -435:3208 -435:3210 -435:3216 -435:3218 -435:3220 -435:3222 -435:3224 -435:3230 -435:3232 -435:3234 -435:3236 -435:3238 -435:3240 -435:3242 -435:3244 -435:3248 -435:3250 -435:3252 -435:3254 -435:3256 -435:3258 -435:3260 -435:3262 -435:3264 -435:3268 -435:3270 -435:3272 -437:3276 -437:3280 -437:3282 -437:3284 -437:3286 -437:3288 -437:3290 -437:3292 -437:3294 -437:3296 -437:3300 -437:3302 -437:3304 -439:3320 -439:3322 -439:3324 -439:3326 -439:3330 -439:3334 -439:3336 -439:3338 -439:3340 -439:3342 -439:3344 -439:3346 -439:3348 -439:3350 -439:3354 -439:3356 -439:3358 -439:3360 -441:3382 -441:3386 -441:3388 -441:3390 -441:3392 -441:3398 -441:3400 -441:3402 -441:3408 -441:3410 -441:3412 -441:3414 -441:3416 -441:3420 -441:3422 -441:3426 -441:3592 -441:3596 -445:2914 -445:3428 -445:3432 -445:3434 -445:3436 -445:3438 -445:3440 -445:3442 -445:3444 -445:3446 -445:3448 -445:3450 -445:3452 -445:3454 -445:3456 -445:3460 -445:3462 -445:3466 -445:3468 -445:3470 -445:3474 -445:3482 -445:3484 -445:3486 -445:3488 -445:3490 -445:3494 -445:3498 -445:3560 -445:3562 -445:3564 -445:3566 -445:3568 -446:2916 -446:3508 -446:3510 -446:3512 -446:3516 -446:3518 -446:3520 -446:3522 -446:3524 -446:3528 -446:3532 -447:2918 -447:3542 -447:3544 -447:3546 -447:3548 -447:3550 -447:3552 -449:3572 -451:3576 -453:3578 -455:3580 -457:3582 -459:3584 -461:3586 -463:3630 -463:3632 -463:3634 -463:3636 -463:3752 -463:3754 -463:3756 -463:3758 -463:3760 -463:3762 -464:3642 -464:3644 -464:3646 -464:3648 -464:3654 -464:3656 -464:3658 -464:3664 -464:3666 -464:3668 -464:3670 -464:3672 -464:3678 -464:3680 -464:3682 -464:3684 -464:3690 -464:3692 -464:3694 -464:3712 -464:3714 -464:3716 -464:3718 -464:3720 -464:3726 -464:3728 -464:3730 -464:3732 -464:3734 -464:3736 -464:3738 -464:3740 -464:3742 -464:3746 -464:3748 -464:3750 -469:3766 -469:3768 -469:3770 -469:3772 -469:3776 -469:3818 -469:3820 -469:3822 -469:3824 -469:3826 -469:3828 -469:3830 -469:3832 -469:3834 -469:3836 -469:3838 -470:3778 -470:3780 -470:3782 -470:3788 -470:3790 -470:3792 -470:3798 -470:3800 -470:3802 -470:3808 -470:3810 -470:3812 -*E diff --git a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap b/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap deleted file mode 100644 index 0bd373fe747..00000000000 --- a/libjava/classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap +++ /dev/null @@ -1,987 +0,0 @@ -SMAP -JavaRecognizer.java -G -*S G -*F -+ 0 java-expression.g -java-expression.g -*L -19:4 -46:109 -46:111 -46:113 -46:115 -46:119 -46:121 -46:123 -46:199 -46:201 -46:203 -47:125 -47:127 -47:131 -47:133 -47:135 -47:137 -47:139 -47:141 -47:143 -47:145 -47:147 -47:149 -47:151 -47:153 -47:157 -47:159 -47:161 -47:163 -47:165 -47:169 -47:171 -48:173 -48:175 -48:187 -48:191 -48:193 -50:179 -50:197 -52:181 -54:183 -57:481 -57:483 -57:487 -57:489 -57:491 -57:501 -57:503 -57:505 -58:495 -58:497 -58:499 -62:207 -62:209 -62:213 -62:215 -62:217 -62:221 -62:463 -62:465 -62:467 -62:469 -62:471 -62:473 -62:475 -62:477 -63:223 -63:225 -63:227 -63:229 -63:231 -63:233 -63:235 -63:237 -64:247 -64:249 -64:251 -64:253 -64:255 -64:257 -64:259 -64:261 -65:271 -65:273 -65:275 -65:277 -65:279 -65:281 -65:283 -65:285 -66:295 -66:297 -66:299 -66:301 -66:303 -66:305 -66:307 -66:309 -67:319 -67:321 -67:323 -67:325 -67:327 -67:329 -67:331 -67:333 -68:241 -68:343 -68:345 -68:347 -68:349 -68:351 -68:353 -68:355 -68:357 -69:265 -69:367 -69:369 -69:371 -69:373 -69:375 -69:377 -69:379 -69:381 -70:289 -70:391 -70:393 -70:395 -70:397 -70:399 -70:401 -70:403 -70:405 -71:313 -71:415 -71:417 -71:419 -71:421 -71:423 -71:425 -71:427 -71:429 -72:337 -72:439 -72:441 -72:443 -72:445 -72:447 -72:449 -72:451 -72:453 -73:361 -74:385 -75:409 -76:433 -77:457 -77:509 -77:511 -77:515 -77:517 -77:519 -77:591 -77:593 -77:595 -78:521 -78:523 -78:525 -78:527 -78:531 -78:533 -78:535 -78:537 -78:539 -78:541 -78:545 -78:547 -78:549 -78:551 -78:553 -78:555 -78:557 -78:559 -78:561 -78:563 -78:565 -78:567 -78:569 -78:571 -78:575 -78:577 -78:579 -78:581 -78:585 -78:587 -78:589 -81:599 -81:601 -81:605 -81:607 -81:609 -81:621 -81:623 -81:625 -82:613 -82:615 -82:617 -85:619 -86:629 -86:631 -86:635 -86:637 -86:639 -86:641 -86:711 -86:713 -86:715 -87:645 -87:647 -88:651 -88:653 -88:655 -88:657 -88:659 -88:661 -88:663 -88:665 -88:667 -88:669 -88:671 -88:673 -88:675 -88:677 -88:697 -88:699 -88:701 -88:703 -88:705 -90:709 -93:719 -93:721 -93:725 -93:727 -93:729 -93:731 -93:781 -93:783 -93:785 -94:735 -94:737 -94:739 -94:741 -94:743 -94:745 -94:747 -94:749 -94:751 -94:753 -94:755 -94:757 -94:759 -94:761 -94:765 -94:767 -94:769 -94:771 -94:775 -94:777 -94:779 -99:789 -99:791 -99:795 -99:797 -99:799 -99:801 -99:851 -99:853 -99:855 -100:805 -100:807 -100:809 -100:811 -100:813 -100:815 -100:817 -100:819 -100:821 -100:823 -100:825 -100:827 -100:829 -100:831 -100:835 -100:837 -100:839 -100:841 -100:845 -100:847 -100:849 -105:859 -105:861 -105:865 -105:867 -105:869 -105:871 -105:921 -105:923 -105:925 -106:875 -106:877 -106:879 -106:881 -106:883 -106:885 -106:887 -106:889 -106:891 -106:893 -106:895 -106:897 -106:899 -106:901 -106:905 -106:907 -106:909 -106:911 -106:915 -106:917 -106:919 -111:929 -111:931 -111:935 -111:937 -111:939 -111:941 -111:991 -111:993 -111:995 -112:945 -112:947 -112:949 -112:951 -112:953 -112:955 -112:957 -112:959 -112:961 -112:963 -112:965 -112:967 -112:969 -112:971 -112:975 -112:977 -112:979 -112:981 -112:985 -112:987 -112:989 -117:999 -117:1001 -117:1005 -117:1007 -117:1009 -117:1011 -117:1061 -117:1063 -117:1065 -118:1015 -118:1017 -118:1019 -118:1021 -118:1023 -118:1025 -118:1027 -118:1029 -118:1031 -118:1033 -118:1035 -118:1037 -118:1039 -118:1041 -118:1045 -118:1047 -118:1049 -118:1051 -118:1055 -118:1057 -118:1059 -123:1069 -123:1071 -123:1075 -123:1077 -123:1079 -123:1081 -123:1181 -123:1183 -123:1185 -124:1085 -124:1087 -124:1089 -124:1091 -124:1093 -124:1095 -124:1099 -124:1101 -124:1103 -124:1105 -124:1107 -124:1109 -124:1111 -124:1113 -124:1115 -124:1117 -124:1119 -124:1127 -124:1129 -124:1131 -124:1133 -124:1135 -124:1137 -124:1139 -124:1141 -124:1143 -124:1145 -124:1153 -124:1155 -124:1157 -124:1159 -124:1161 -124:1165 -124:1167 -124:1169 -124:1171 -124:1175 -124:1177 -124:1179 -129:1189 -129:1191 -129:1195 -129:1197 -129:1199 -129:1201 -129:1357 -129:1359 -129:1361 -130:1205 -130:1207 -131:1211 -131:1213 -131:1215 -131:1217 -131:1221 -131:1223 -131:1225 -131:1227 -131:1229 -131:1231 -131:1233 -131:1235 -131:1237 -131:1239 -131:1241 -131:1327 -131:1329 -131:1331 -131:1333 -131:1335 -131:1339 -131:1341 -131:1343 -131:1345 -131:1349 -131:1351 -132:1249 -132:1251 -132:1253 -132:1255 -132:1257 -132:1259 -132:1261 -132:1263 -132:1265 -132:1267 -133:1275 -133:1277 -133:1279 -133:1281 -133:1283 -133:1285 -133:1287 -133:1289 -133:1291 -133:1293 -133:1355 -134:1301 -134:1303 -134:1305 -134:1307 -134:1309 -134:1311 -134:1313 -134:1315 -134:1317 -134:1319 -143:1365 -143:1367 -143:1371 -143:1373 -143:1375 -143:1377 -143:1503 -143:1505 -143:1507 -144:1381 -144:1383 -144:1385 -144:1387 -144:1389 -144:1391 -144:1395 -144:1397 -144:1399 -144:1401 -144:1403 -144:1405 -144:1407 -144:1409 -144:1411 -144:1413 -144:1415 -144:1423 -144:1425 -144:1427 -144:1429 -144:1431 -144:1433 -144:1435 -144:1437 -144:1439 -144:1441 -144:1449 -144:1451 -144:1453 -144:1455 -144:1457 -144:1459 -144:1461 -144:1463 -144:1465 -144:1467 -144:1475 -144:1477 -144:1479 -144:1481 -144:1483 -144:1487 -144:1489 -144:1491 -144:1493 -144:1497 -144:1499 -144:1501 -149:1511 -149:1513 -149:1517 -149:1519 -149:1521 -149:1523 -149:1623 -149:1625 -149:1627 -150:1527 -150:1529 -150:1531 -150:1533 -150:1535 -150:1537 -150:1541 -150:1543 -150:1545 -150:1547 -150:1549 -150:1551 -150:1553 -150:1555 -150:1557 -150:1559 -150:1561 -150:1569 -150:1571 -150:1573 -150:1575 -150:1577 -150:1579 -150:1581 -150:1583 -150:1585 -150:1587 -150:1595 -150:1597 -150:1599 -150:1601 -150:1603 -150:1607 -150:1609 -150:1611 -150:1613 -150:1617 -150:1619 -150:1621 -155:1631 -155:1633 -155:1637 -155:1639 -155:1641 -155:1643 -155:1769 -155:1771 -155:1773 -156:1647 -156:1649 -156:1651 -156:1653 -156:1655 -156:1657 -156:1661 -156:1663 -156:1665 -156:1667 -156:1669 -156:1671 -156:1673 -156:1675 -156:1677 -156:1679 -156:1681 -156:1689 -156:1691 -156:1693 -156:1695 -156:1697 -156:1699 -156:1701 -156:1703 -156:1705 -156:1707 -156:1715 -156:1717 -156:1719 -156:1721 -156:1723 -156:1725 -156:1727 -156:1729 -156:1731 -156:1733 -156:1741 -156:1743 -156:1745 -156:1747 -156:1749 -156:1753 -156:1755 -156:1757 -156:1759 -156:1763 -156:1765 -156:1767 -160:1777 -160:1779 -160:1783 -160:1785 -160:1787 -160:1789 -160:1793 -160:1895 -160:1897 -160:1899 -160:1901 -160:1903 -160:1905 -160:1907 -160:1909 -161:1795 -161:1797 -161:1799 -161:1801 -161:1803 -161:1805 -161:1807 -161:1809 -161:1813 -161:1815 -161:1817 -161:1819 -162:1829 -162:1831 -162:1833 -162:1835 -162:1837 -162:1839 -162:1841 -162:1843 -162:1847 -162:1849 -162:1851 -163:1857 -163:1859 -163:1861 -163:1863 -163:1865 -163:1867 -163:1869 -163:1871 -163:1873 -163:1875 -163:1877 -163:1879 -163:1881 -163:1883 -163:1885 -163:1887 -163:1889 -166:1823 -166:1913 -166:1915 -166:1919 -166:1921 -166:1923 -166:1929 -166:1933 -166:1991 -166:2063 -166:2073 -166:2075 -166:2077 -166:2079 -166:2081 -166:2083 -166:2085 -166:2087 -167:1935 -167:1937 -167:1939 -167:1941 -167:1943 -167:1945 -167:1947 -167:1949 -167:1951 -167:1953 -168:1963 -168:1965 -168:1967 -168:1969 -168:1971 -168:1973 -168:1975 -168:1977 -168:1979 -168:1981 -171:1993 -171:1995 -171:1997 -171:1999 -171:2001 -171:2003 -171:2007 -171:2009 -171:2011 -171:2015 -171:2017 -171:2019 -171:2021 -171:2023 -171:2025 -171:2027 -171:2029 -172:1925 -172:1927 -172:1957 -172:2031 -172:2033 -172:2035 -172:2037 -172:2039 -172:2041 -172:2045 -172:2047 -172:2049 -173:1985 -173:2051 -173:2053 -173:2055 -173:2057 -175:2065 -175:2067 -175:2069 -175:2071 -178:2061 -179:2091 -179:2093 -179:2097 -179:2099 -179:2101 -179:2105 -179:2241 -179:2243 -179:2245 -179:2247 -179:2249 -179:2251 -179:2253 -179:2255 -180:2107 -180:2109 -180:2111 -180:2113 -180:2115 -180:2117 -180:2119 -180:2121 -180:2123 -180:2125 -181:2131 -181:2133 -181:2135 -181:2137 -181:2139 -181:2141 -182:2151 -182:2153 -182:2155 -182:2157 -182:2159 -182:2161 -182:2163 -182:2165 -183:2175 -183:2177 -183:2179 -183:2181 -183:2183 -183:2185 -183:2187 -183:2189 -184:2199 -184:2201 -184:2203 -184:2205 -184:2207 -184:2209 -184:2211 -184:2213 -185:2223 -185:2225 -185:2227 -185:2229 -185:2231 -185:2233 -186:2145 -187:2169 -188:2193 -188:2235 -189:2217 -190:2461 -190:2464 -190:2466 -190:2470 -190:2472 -190:2474 -190:2526 -190:2528 -190:2530 -191:2462 -191:2478 -191:2480 -191:2482 -191:2484 -192:2486 -192:2488 -192:2490 -192:2510 -192:2512 -192:2514 -192:2516 -192:2520 -192:2522 -192:2524 -198:2492 -198:2494 -198:2496 -198:2498 -198:2500 -198:2502 -198:2504 -198:2506 -198:2508 -202:2259 -202:2261 -202:2265 -202:2267 -202:2269 -202:2297 -202:2443 -202:2445 -202:2447 -202:2449 -202:2451 -202:2453 -202:2455 -202:2457 -203:2271 -203:2273 -203:2299 -203:2301 -203:2303 -203:2305 -203:2307 -203:2309 -203:2311 -203:2313 -204:2275 -204:2277 -204:2323 -204:2325 -204:2327 -204:2329 -204:2331 -204:2333 -204:2335 -204:2337 -205:2279 -205:2281 -205:2347 -205:2349 -205:2351 -205:2353 -205:2355 -205:2357 -205:2359 -205:2361 -206:2283 -206:2285 -206:2371 -206:2373 -206:2375 -206:2377 -206:2379 -206:2381 -206:2383 -206:2385 -207:2287 -207:2289 -207:2395 -207:2397 -207:2399 -207:2401 -207:2403 -207:2405 -207:2407 -207:2409 -208:2291 -208:2293 -208:2317 -208:2419 -208:2421 -208:2423 -208:2425 -208:2427 -208:2429 -208:2431 -208:2433 -209:2341 -210:2365 -211:2389 -212:2413 -213:2437 -*E diff --git a/libjava/sources.am b/libjava/sources.am index b35ad69da73..b108484277d 100644 --- a/libjava/sources.am +++ b/libjava/sources.am @@ -4699,6 +4699,7 @@ java/lang/Thread.java \ classpath/java/lang/ThreadDeath.java \ classpath/java/lang/ThreadGroup.java \ java/lang/ThreadLocal.java \ +classpath/java/lang/ThreadLocalMap.java \ classpath/java/lang/Throwable.java \ classpath/java/lang/TypeNotPresentException.java \ classpath/java/lang/UnknownError.java \ |