found the bug of \\ in chars
See also mails.txt :-)
diff -rc2P java2html-1.3/configure java2html-1.3.1/configure
*** java2html-1.3/configure Sun Nov 28 20:56:33 1999
--- java2html-1.3.1/configure Sun Nov 28 20:40:34 1999
***************
*** 698,702 ****
PACKAGE=java2html
! VERSION=1.3
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
--- 698,702 ----
PACKAGE=java2html
! VERSION=1.3.1
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
diff -rc2P java2html-1.3/configure.in java2html-1.3.1/configure.in
*** java2html-1.3/configure.in Tue Sep 7 21:37:43 1999
--- java2html-1.3.1/configure.in Sun Nov 28 20:40:26 1999
***************
*** 3,7 ****
dnl for automake
! AM_INIT_AUTOMAKE(java2html, 1.3)
AM_CONFIG_HEADER( config.h )
--- 3,7 ----
dnl for automake
! AM_INIT_AUTOMAKE(java2html, 1.3.1)
AM_CONFIG_HEADER( config.h )
diff -rc2P java2html-1.3/java2html.html java2html-1.3.1/java2html.html
*** java2html-1.3/java2html.html Tue Sep 7 21:37:44 1999
--- java2html-1.3.1/java2html.html Mon Nov 29 22:11:44 1999
***************
*** 3,7 ****
!
Java2html - GNU Project - Free Software Foundation (FSF)
--- 3,7 ----
!
Java2html - GNU Project - Free Software Foundation (FSF)
***************
*** 9,13 ****
! java2html 1.3
by Lorenzo Bettini
This is a simple program that, given a source java file, produces
--- 9,13 ----
! java2html 1.3.1
by Lorenzo Bettini
This is a simple program that, given a source java file, produces
***************
*** 20,31 ****
Otherwise you can download sources or executable directly from my home
pages:
!
http://w3.newnet.it/bettini/software/java2html/java2html-1.3.tar.gz
!
http://w3.newnet.it/bettini/software/java2html/java2html-1.3-exe-Win32.zip
(win32 executable)
or if you're in Italian University (GARR),
here's some faster places:
!
http://infostud.dsi.unifi.it/~bettini/software/java2html/java2html-1.3.tar.gz
!
http://infostud.dsi.unifi.it/~bettini/software/java2html/java2html-1.3-exe-Win32.zip
(win32 executable)
Changes from v. 1.2
--- 20,46 ----
Otherwise you can download sources or executable directly from my home
pages:
!
http://w3.newnet.it/bettini/software/java2html/java2html-1.3.1.tar.gz
!
http://w3.newnet.it/bettini/software/java2html/java2html-1.3.1-exe-Win32.zip
(win32 executable)
or if you're in Italian University (GARR),
here's some faster places:
!
http://infostud.dsi.unifi.it/~bettini/software/java2html/java2html-1.3.1.tar.gz
!
http://infostud.dsi.unifi.it/~bettini/software/java2html/java2html-1.3.1-exe-Win32.zip
(win32 executable)
+
or you can get the pacthes (see below
+ for patching from a previous version):
+
+
+
+ Changes from v. 1.3
+
+
+
Changes from v. 1.2
***************
*** 99,102 ****
--- 114,127 ----
it in the same place of the .exe).
+ Patching from a previous
+ version
+ If you download a pacth, say java2html-1.3-1.3.1-patch.gz (i.e.
+ the pacth to go from version 1.3 to version 1.3.1), cd to the directory
+ with sources from the previous version (java2html-1.3) and type:
+ gunzip -cd ../java2html-1.3-1.3.1.patch.gz | patch -p1
+ and recompile the whole thing (if you had already run configure a simple
+ make
+ will do).
+
Usage
java2html only does a lexical analisys of the source code, so the Java
***************
*** 126,130 ****
which can also be obtained by typing
make test
! And here's the output of `java2html -help`
Syntax : java2html [-input infile] [-output outfile] [-doc] [-css [<cssurl>]] [-tab=#] [-title "Document Title"]
-doc : create a complete html doc (with <HTML>, <BODY>...
--- 151,157 ----
which can also be obtained by typing
make test
! This test works if you type it after the installation or if you have .
! in your PATH.
! And here's the output of `java2html -help`
Syntax : java2html [-input infile] [-output outfile] [-doc] [-css [<cssurl>]] [-tab=#] [-title "Document Title"]
-doc : create a complete html doc (with <HTML>, <BODY>...
***************
*** 203,206 ****
--- 230,237 ----
Kaloian Doganov <kaloian@stones.com>
for .css suggestion and for providing some nice .css files
+
+
+ Ziv Caspi <zivc@peach-networks.com>
+ found the bug of \\ in chars
See also mails.txt :-)
diff -rc2P java2html-1.3/mails.txt java2html-1.3.1/mails.txt
*** java2html-1.3/mails.txt Wed Aug 25 19:19:11 1999
--- java2html-1.3.1/mails.txt Sun Nov 28 20:44:51 1999
***************
*** 184,185 ****
--- 184,210 ----
--
- Jari Korva - jari.korva@iki.fi
+
+ ***********************************************
+
+ Subject: BUG REPORT: Incorrect treatment of backslashes in strings
+ Date: Wed, 24 Nov 1999 11:08:31 +0200
+ From: Ziv Caspi
+ To: bug-java2html@gnu.org
+
+
+ java2html fails to identify that there
+ is a single backslash in the following
+ code fragment:
+
+ int a( int b )
+ {
+ _tcsrchr( 0, _T('\\') );
+ }
+
+ Instead, it things that the character
+ string has started, but is never ended.
+
+ ----------------------------------------------
+ Ziv caspi zivca@netvision.net.il
+ Peach-Networks, ltd.
+
diff -rc2P java2html-1.3/scanner.cc java2html-1.3.1/scanner.cc
*** java2html-1.3/scanner.cc Sun Nov 28 20:56:42 1999
--- java2html-1.3.1/scanner.cc Sun Nov 28 20:31:50 1999
***************
*** 294,344 ****
yy_c_buf_p = yy_cp;
! #define YY_NUM_RULES 69
! #define YY_END_OF_BUFFER 70
! static yyconst short int yy_acclist[363] =
{ 0,
! 64, 64, 70, 67, 69, 66, 67, 69, 68, 69,
! 1, 67, 69, 11, 67, 69, 10, 67, 69, 14,
! 67, 69, 67, 69, 64, 67, 69, 8, 67, 69,
! 9, 67, 69, 65, 67, 69, 65, 67, 69, 65,
! 67, 69, 65, 67, 69, 65, 67, 69, 65, 67,
! 69, 65, 67, 69, 65, 67, 69, 65, 67, 69,
! 65, 67, 69, 65, 67, 69, 65, 67, 69, 65,
! 67, 69, 65, 67, 69, 65, 67, 69, 65, 67,
! 69, 65, 67, 69, 67, 69, 67, 69, 7, 68,
! 69, 67, 69, 13, 67, 69, 67, 69, 16, 67,
!
! 69, 67, 69, 2, 5, 64, 65, 65, 65, 65,
! 65, 65, 65, 65, 65, 65, 25, 65, 65, 65,
! 65, 65, 65, 65, 32, 65, 65, 65, 65, 65,
! 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
! 65, 65, 65, 65, 4, 6, 12, 15, 65, 65,
! 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
! 65, 65, 65, 30, 65, 65, 65, 65, 55, 65,
! 65, 65, 38, 65, 65, 65, 65, 65, 65, 65,
! 65, 65, 65, 65, 65, 65, 65, 52, 65, 65,
! 65, 65, 3, 65, 65, 65, 56, 65, 19, 65,
!
! 65, 58, 65, 65, 65, 65, 65, 65, 26, 65,
! 65, 65, 65, 31, 65, 65, 65, 65, 65, 59,
! 65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
! 65, 65, 50, 65, 65, 65, 63, 65, 65, 65,
! 65, 65, 18, 65, 20, 65, 21, 65, 22, 65,
! 65, 65, 65, 65, 28, 65, 60, 65, 65, 65,
! 65, 65, 65, 65, 65, 65, 65, 65, 62, 65,
! 65, 45, 65, 65, 65, 48, 65, 65, 65, 54,
! 65, 65, 65, 65, 65, 61, 65, 65, 65, 65,
! 33, 65, 65, 65, 37, 65, 65, 65, 65, 42,
!
! 65, 43, 65, 44, 65, 46, 65, 65, 49, 65,
! 65, 65, 65, 57, 65, 65, 24, 65, 27, 65,
! 29, 65, 65, 65, 65, 39, 65, 40, 65, 65,
! 65, 65, 65, 17, 65, 23, 65, 65, 65, 65,
! 65, 65, 65, 53, 65, 65, 65, 36, 65, 41,
! 65, 65, 51, 65, 34, 65, 35, 65, 65, 65,
! 47, 65
} ;
! static yyconst short int yy_accept[264] =
{ 0,
1, 2, 3, 3, 3, 3, 3, 3, 3, 3,
--- 294,344 ----
yy_c_buf_p = yy_cp;
! #define YY_NUM_RULES 71
! #define YY_END_OF_BUFFER 72
! static yyconst short int yy_acclist[365] =
{ 0,
! 66, 66, 72, 69, 71, 68, 69, 71, 70, 71,
! 1, 69, 71, 11, 69, 71, 10, 69, 71, 15,
! 69, 71, 69, 71, 66, 69, 71, 8, 69, 71,
! 9, 69, 71, 67, 69, 71, 67, 69, 71, 67,
! 69, 71, 67, 69, 71, 67, 69, 71, 67, 69,
! 71, 67, 69, 71, 67, 69, 71, 67, 69, 71,
! 67, 69, 71, 67, 69, 71, 67, 69, 71, 67,
! 69, 71, 67, 69, 71, 67, 69, 71, 67, 69,
! 71, 67, 69, 71, 69, 71, 69, 71, 7, 70,
! 71, 69, 71, 14, 69, 71, 69, 71, 18, 69,
!
! 71, 69, 71, 2, 5, 66, 67, 67, 67, 67,
! 67, 67, 67, 67, 67, 67, 27, 67, 67, 67,
! 67, 67, 67, 67, 34, 67, 67, 67, 67, 67,
! 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
! 67, 67, 67, 67, 4, 6, 13, 12, 17, 16,
! 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
! 67, 67, 67, 67, 67, 32, 67, 67, 67, 67,
! 57, 67, 67, 67, 40, 67, 67, 67, 67, 67,
! 67, 67, 67, 67, 67, 67, 67, 67, 67, 54,
! 67, 67, 67, 67, 3, 67, 67, 67, 58, 67,
!
! 21, 67, 67, 60, 67, 67, 67, 67, 67, 67,
! 28, 67, 67, 67, 67, 33, 67, 67, 67, 67,
! 67, 61, 67, 67, 67, 67, 67, 67, 67, 67,
! 67, 67, 67, 67, 52, 67, 67, 67, 65, 67,
! 67, 67, 67, 67, 20, 67, 22, 67, 23, 67,
! 24, 67, 67, 67, 67, 67, 30, 67, 62, 67,
! 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
! 64, 67, 67, 47, 67, 67, 67, 50, 67, 67,
! 67, 56, 67, 67, 67, 67, 67, 63, 67, 67,
! 67, 67, 35, 67, 67, 67, 39, 67, 67, 67,
!
! 67, 44, 67, 45, 67, 46, 67, 48, 67, 67,
! 51, 67, 67, 67, 67, 59, 67, 67, 26, 67,
! 29, 67, 31, 67, 67, 67, 67, 41, 67, 42,
! 67, 67, 67, 67, 67, 19, 67, 25, 67, 67,
! 67, 67, 67, 67, 67, 55, 67, 67, 67, 38,
! 67, 43, 67, 67, 53, 67, 36, 67, 37, 67,
! 67, 67, 49, 67
} ;
! static yyconst short int yy_accept[266] =
{ 0,
1, 2, 3, 3, 3, 3, 3, 3, 3, 3,
***************
*** 351,374 ****
129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
! 149, 149, 149, 150, 151, 152, 153, 154, 155, 156,
! 157, 158, 159, 160, 161, 162, 163, 164, 166, 167,
! 168, 169, 171, 172, 173, 175, 176, 177, 178, 179,
! 180, 181, 182, 183, 184, 185, 186, 187, 188, 190,
! 191, 192, 193, 194, 195, 196, 197, 199, 201, 202,
! 204, 205, 206, 207, 208, 209, 211, 212, 213, 214,
! 216, 217, 218, 219, 220, 222, 223, 224, 225, 226,
! 227, 228, 229, 230, 231, 232, 233, 235, 236, 237,
! 239, 240, 241, 242, 243, 245, 247, 249, 251, 252,
! 253, 254, 255, 257, 259, 260, 261, 262, 263, 264,
! 265, 266, 267, 268, 269, 271, 272, 274, 275, 276,
!
! 278, 279, 280, 282, 283, 284, 285, 286, 288, 289,
! 290, 291, 293, 294, 295, 297, 298, 299, 300, 302,
! 304, 306, 308, 309, 311, 312, 313, 314, 316, 317,
! 319, 321, 323, 324, 325, 326, 328, 330, 331, 332,
! 333, 334, 336, 338, 339, 340, 341, 342, 343, 344,
! 346, 347, 348, 350, 352, 353, 355, 357, 359, 360,
! 361, 363, 363
} ;
--- 351,374 ----
129, 130, 131, 132, 133, 134, 135, 136, 137, 138,
139, 140, 141, 142, 143, 144, 145, 146, 147, 148,
! 149, 150, 151, 151, 151, 152, 153, 154, 155, 156,
! 157, 158, 159, 160, 161, 162, 163, 164, 165, 166,
! 168, 169, 170, 171, 173, 174, 175, 177, 178, 179,
! 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,
! 190, 192, 193, 194, 195, 196, 197, 198, 199, 201,
! 203, 204, 206, 207, 208, 209, 210, 211, 213, 214,
! 215, 216, 218, 219, 220, 221, 222, 224, 225, 226,
! 227, 228, 229, 230, 231, 232, 233, 234, 235, 237,
! 238, 239, 241, 242, 243, 244, 245, 247, 249, 251,
! 253, 254, 255, 256, 257, 259, 261, 262, 263, 264,
! 265, 266, 267, 268, 269, 270, 271, 273, 274, 276,
!
! 277, 278, 280, 281, 282, 284, 285, 286, 287, 288,
! 290, 291, 292, 293, 295, 296, 297, 299, 300, 301,
! 302, 304, 306, 308, 310, 311, 313, 314, 315, 316,
! 318, 319, 321, 323, 325, 326, 327, 328, 330, 332,
! 333, 334, 335, 336, 338, 340, 341, 342, 343, 344,
! 345, 346, 348, 349, 350, 352, 354, 355, 357, 359,
! 361, 362, 363, 365, 365
} ;
***************
*** 413,483 ****
} ;
! static yyconst short int yy_base[266] =
{ 0,
0, 0, 38, 52, 62, 64, 69, 70, 72, 74,
! 307, 308, 308, 308, 308, 308, 308, 308, 60, 296,
! 308, 308, 0, 289, 57, 74, 72, 65, 70, 276,
! 77, 275, 90, 77, 283, 84, 90, 273, 278, 290,
! 290, 308, 105, 308, 292, 308, 289, 287, 308, 284,
! 0, 262, 264, 272, 258, 91, 274, 273, 260, 266,
! 252, 253, 251, 255, 253, 250, 247, 0, 249, 93,
! 250, 244, 240, 257, 103, 257, 240, 243, 255, 240,
! 245, 240, 85, 96, 104, 243, 308, 308, 308, 308,
! 257, 126, 232, 238, 247, 242, 241, 242, 228, 226,
!
! 105, 241, 239, 235, 234, 237, 236, 0, 222, 113,
! 217, 229, 226, 223, 0, 221, 210, 211, 217, 208,
! 210, 207, 219, 205, 219, 204, 206, 206, 0, 214,
! 216, 205, 221, 198, 208, 202, 0, 0, 203, 0,
! 193, 191, 199, 188, 195, 0, 192, 193, 185, 0,
! 197, 185, 199, 183, 0, 178, 196, 195, 190, 185,
! 177, 174, 182, 174, 186, 180, 0, 166, 169, 0,
! 167, 179, 182, 181, 0, 0, 0, 0, 168, 169,
! 174, 174, 166, 0, 164, 157, 161, 167, 167, 164,
! 152, 166, 165, 154, 0, 163, 0, 157, 148, 146,
!
! 153, 152, 0, 157, 146, 139, 139, 0, 139, 132,
! 149, 0, 150, 151, 0, 146, 145, 131, 0, 0,
! 0, 0, 134, 0, 142, 135, 127, 0, 139, 0,
! 0, 0, 130, 137, 138, 0, 0, 135, 126, 125,
! 132, 0, 0, 118, 121, 129, 128, 117, 107, 0,
! 101, 110, 0, 0, 90, 0, 0, 0, 99, 58,
! 0, 308, 141, 48, 144
} ;
! static yyconst short int yy_def[266] =
{ 0,
! 262, 1, 263, 263, 4, 4, 4, 4, 4, 4,
! 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
! 262, 262, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 262,
! 262, 262, 262, 262, 262, 262, 262, 265, 262, 262,
264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 262, 262, 262, 262,
! 265, 265, 264, 264, 264, 264, 264, 264, 264, 264,
!
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 265, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
!
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 0, 262, 262, 262
} ;
! static yyconst short int yy_nxt[347] =
{ 0,
12, 13, 14, 15, 16, 17, 18, 12, 19, 20,
--- 413,483 ----
} ;
! static yyconst short int yy_base[268] =
{ 0,
0, 0, 38, 52, 62, 64, 69, 70, 72, 74,
! 309, 310, 310, 310, 310, 310, 310, 310, 60, 298,
! 310, 310, 0, 291, 57, 74, 72, 65, 70, 278,
! 77, 277, 90, 77, 285, 84, 90, 275, 280, 292,
! 292, 310, 105, 310, 110, 310, 104, 291, 310, 288,
! 0, 266, 268, 276, 262, 91, 278, 277, 264, 270,
! 256, 257, 255, 259, 257, 254, 251, 0, 253, 94,
! 254, 248, 244, 261, 104, 261, 244, 247, 259, 244,
! 249, 244, 105, 93, 106, 247, 310, 310, 310, 310,
! 310, 310, 261, 125, 236, 242, 251, 246, 245, 246,
!
! 232, 230, 105, 245, 243, 239, 238, 241, 240, 0,
! 226, 113, 221, 233, 230, 227, 0, 225, 214, 215,
! 221, 212, 214, 211, 223, 209, 223, 208, 210, 210,
! 0, 218, 220, 209, 225, 202, 212, 206, 0, 0,
! 207, 0, 197, 195, 203, 192, 199, 0, 196, 197,
! 189, 0, 201, 189, 203, 187, 0, 182, 200, 199,
! 194, 189, 181, 178, 186, 178, 190, 184, 0, 170,
! 173, 0, 171, 183, 186, 185, 0, 0, 0, 0,
! 172, 173, 178, 178, 170, 0, 168, 161, 165, 171,
! 171, 168, 156, 170, 169, 158, 0, 167, 0, 161,
!
! 152, 150, 157, 156, 0, 161, 150, 143, 143, 0,
! 143, 136, 153, 0, 154, 155, 0, 150, 149, 135,
! 0, 0, 0, 0, 138, 0, 146, 139, 131, 0,
! 143, 0, 0, 0, 134, 141, 142, 0, 0, 139,
! 130, 129, 136, 0, 0, 122, 125, 133, 133, 127,
! 117, 0, 117, 126, 0, 0, 102, 0, 0, 0,
! 120, 58, 0, 310, 141, 48, 144
} ;
! static yyconst short int yy_def[268] =
{ 0,
! 264, 1, 265, 265, 4, 4, 4, 4, 4, 4,
264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 264,
! 264, 264, 264, 264, 264, 264, 264, 267, 264, 264,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 264, 264, 264, 264,
! 264, 264, 267, 267, 266, 266, 266, 266, 266, 266,
!
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 267, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
!
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 266, 266, 266, 266, 266, 266, 266,
! 266, 266, 266, 0, 264, 264, 264
} ;
! static yyconst short int yy_nxt[349] =
{ 0,
12, 13, 14, 15, 16, 17, 18, 12, 19, 20,
***************
*** 488,525 ****
51, 12, 12, 13, 14, 15, 12, 17, 12, 40,
41, 12, 21, 22, 42, 12, 42, 48, 49, 12,
! 43, 12, 43, 44, 44, 261, 12, 12, 46, 12,
46, 12, 45, 45, 53, 47, 54, 47, 56, 62,
60, 74, 64, 55, 65, 57, 68, 66, 58, 61,
! 63, 59, 69, 70, 72, 78, 75, 126, 73, 76,
! 128, 83, 48, 88, 127, 79, 80, 260, 81, 84,
! 82, 97, 98, 111, 112, 117, 130, 259, 131, 258,
! 118, 257, 129, 92, 133, 142, 143, 151, 256, 255,
! 152, 23, 23, 23, 91, 254, 91, 253, 252, 251,
! 250, 249, 248, 247, 246, 245, 244, 243, 242, 241,
! 240, 239, 238, 237, 236, 235, 234, 233, 232, 231,
! 230, 229, 228, 227, 226, 225, 224, 223, 222, 221,
! 220, 219, 218, 217, 216, 215, 214, 213, 212, 211,
! 210, 209, 208, 207, 206, 205, 204, 203, 202, 201,
!
! 200, 199, 198, 197, 196, 195, 194, 193, 192, 191,
! 190, 189, 188, 187, 186, 185, 184, 183, 182, 181,
! 180, 179, 178, 177, 176, 175, 174, 173, 92, 172,
! 171, 170, 169, 168, 167, 166, 165, 164, 163, 162,
! 161, 160, 159, 158, 157, 156, 155, 154, 153, 150,
! 149, 148, 147, 146, 145, 144, 141, 140, 139, 138,
! 137, 136, 135, 134, 92, 132, 125, 124, 123, 122,
! 121, 120, 119, 116, 115, 114, 113, 110, 109, 108,
! 107, 106, 105, 104, 103, 102, 101, 100, 99, 96,
! 95, 94, 93, 50, 92, 90, 89, 48, 87, 86,
!
! 85, 77, 71, 67, 52, 50, 262, 11, 262, 262,
! 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
! 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
! 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
! 262, 262, 262, 262, 262, 262
} ;
! static yyconst short int yy_chk[347] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
--- 488,525 ----
51, 12, 12, 13, 14, 15, 12, 17, 12, 40,
41, 12, 21, 22, 42, 12, 42, 48, 49, 12,
! 43, 12, 43, 44, 44, 263, 12, 12, 46, 12,
46, 12, 45, 45, 53, 47, 54, 47, 56, 62,
60, 74, 64, 55, 65, 57, 68, 66, 58, 61,
! 63, 59, 69, 70, 72, 78, 75, 130, 73, 76,
! 91, 83, 48, 88, 89, 79, 80, 92, 81, 84,
! 82, 99, 100, 90, 113, 114, 119, 128, 132, 131,
! 133, 120, 94, 135, 129, 144, 145, 153, 262, 261,
! 154, 23, 23, 23, 93, 260, 93, 259, 258, 257,
! 256, 255, 254, 253, 252, 251, 250, 249, 248, 247,
! 246, 245, 244, 243, 242, 241, 240, 239, 238, 237,
! 236, 235, 234, 233, 232, 231, 230, 229, 228, 227,
! 226, 225, 224, 223, 222, 221, 220, 219, 218, 217,
! 216, 215, 214, 213, 212, 211, 210, 209, 208, 207,
!
! 206, 205, 204, 203, 202, 201, 200, 199, 198, 197,
! 196, 195, 194, 193, 192, 191, 190, 189, 188, 187,
! 186, 185, 184, 183, 182, 181, 180, 179, 178, 177,
! 176, 175, 94, 174, 173, 172, 171, 170, 169, 168,
! 167, 166, 165, 164, 163, 162, 161, 160, 159, 158,
! 157, 156, 155, 152, 151, 150, 149, 148, 147, 146,
! 143, 142, 141, 140, 139, 138, 137, 136, 94, 134,
! 127, 126, 125, 124, 123, 122, 121, 118, 117, 116,
! 115, 112, 111, 110, 109, 108, 107, 106, 105, 104,
! 103, 102, 101, 98, 97, 96, 95, 50, 94, 48,
!
! 87, 86, 85, 77, 71, 67, 52, 50, 264, 11,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264
} ;
! static yyconst short int yy_chk[349] =
{ 0,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
***************
*** 528,564 ****
1, 1, 1, 1, 1, 1, 1, 1, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
! 264, 3, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 5, 4, 6, 19, 19, 5,
! 5, 6, 6, 7, 8, 260, 7, 8, 9, 9,
10, 10, 7, 8, 25, 9, 25, 10, 26, 28,
27, 34, 29, 25, 29, 26, 31, 29, 26, 27,
! 28, 26, 31, 31, 33, 36, 34, 83, 33, 34,
! 84, 37, 43, 43, 83, 36, 36, 259, 36, 37,
! 36, 56, 56, 70, 70, 75, 85, 255, 85, 252,
! 75, 251, 84, 92, 92, 101, 101, 110, 249, 248,
! 110, 263, 263, 263, 265, 247, 265, 246, 245, 244,
! 241, 240, 239, 238, 235, 234, 233, 229, 227, 226,
! 225, 223, 218, 217, 216, 214, 213, 211, 210, 209,
! 207, 206, 205, 204, 202, 201, 200, 199, 198, 196,
! 194, 193, 192, 191, 190, 189, 188, 187, 186, 185,
! 183, 182, 181, 180, 179, 174, 173, 172, 171, 169,
!
! 168, 166, 165, 164, 163, 162, 161, 160, 159, 158,
! 157, 156, 154, 153, 152, 151, 149, 148, 147, 145,
! 144, 143, 142, 141, 139, 136, 135, 134, 133, 132,
! 131, 130, 128, 127, 126, 125, 124, 123, 122, 121,
! 120, 119, 118, 117, 116, 114, 113, 112, 111, 109,
! 107, 106, 105, 104, 103, 102, 100, 99, 98, 97,
! 96, 95, 94, 93, 91, 86, 82, 81, 80, 79,
! 78, 77, 76, 74, 73, 72, 71, 69, 67, 66,
! 65, 64, 63, 62, 61, 60, 59, 58, 57, 55,
! 54, 53, 52, 50, 48, 47, 45, 41, 40, 39,
!
! 38, 35, 32, 30, 24, 20, 11, 262, 262, 262,
! 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
! 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
! 262, 262, 262, 262, 262, 262, 262, 262, 262, 262,
! 262, 262, 262, 262, 262, 262
} ;
--- 528,564 ----
1, 1, 1, 1, 1, 1, 1, 1, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
! 266, 3, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 5, 4, 6, 19, 19, 5,
! 5, 6, 6, 7, 8, 262, 7, 8, 9, 9,
10, 10, 7, 8, 25, 9, 25, 10, 26, 28,
27, 34, 29, 25, 29, 26, 31, 29, 26, 27,
! 28, 26, 31, 31, 33, 36, 34, 84, 33, 34,
! 47, 37, 43, 43, 45, 36, 36, 47, 36, 37,
! 36, 56, 56, 45, 70, 70, 75, 83, 85, 84,
! 85, 75, 94, 94, 83, 103, 103, 112, 261, 257,
! 112, 265, 265, 265, 267, 254, 267, 253, 251, 250,
! 249, 248, 247, 246, 243, 242, 241, 240, 237, 236,
! 235, 231, 229, 228, 227, 225, 220, 219, 218, 216,
! 215, 213, 212, 211, 209, 208, 207, 206, 204, 203,
! 202, 201, 200, 198, 196, 195, 194, 193, 192, 191,
! 190, 189, 188, 187, 185, 184, 183, 182, 181, 176,
!
! 175, 174, 173, 171, 170, 168, 167, 166, 165, 164,
! 163, 162, 161, 160, 159, 158, 156, 155, 154, 153,
! 151, 150, 149, 147, 146, 145, 144, 143, 141, 138,
! 137, 136, 135, 134, 133, 132, 130, 129, 128, 127,
! 126, 125, 124, 123, 122, 121, 120, 119, 118, 116,
! 115, 114, 113, 111, 109, 108, 107, 106, 105, 104,
! 102, 101, 100, 99, 98, 97, 96, 95, 93, 86,
! 82, 81, 80, 79, 78, 77, 76, 74, 73, 72,
! 71, 69, 67, 66, 65, 64, 63, 62, 61, 60,
! 59, 58, 57, 55, 54, 53, 52, 50, 48, 41,
!
! 40, 39, 38, 35, 32, 30, 24, 20, 11, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264, 264, 264,
! 264, 264, 264, 264, 264, 264, 264, 264
} ;
***************
*** 833,837 ****
{
yy_current_state = (int) yy_def[yy_current_state];
! if ( yy_current_state >= 263 )
yy_c = yy_meta[(unsigned int) yy_c];
}
--- 833,837 ----
{
yy_current_state = (int) yy_def[yy_current_state];
! if ( yy_current_state >= 265 )
yy_c = yy_meta[(unsigned int) yy_c];
}
***************
*** 840,844 ****
++yy_cp;
}
! while ( yy_base[yy_current_state] != 308 );
yy_find_action:
--- 840,844 ----
++yy_cp;
}
! while ( yy_base[yy_current_state] != 310 );
yy_find_action:
***************
*** 934,953 ****
case 13:
YY_RULE_SETUP
! { BEGIN INITIAL ; endString( yytext ) ; }
YY_BREAK
case 14:
YY_RULE_SETUP
! { BEGIN CHAR_STATE ; startString( yytext ); }
YY_BREAK
case 15:
YY_RULE_SETUP
! { generate( yytext ) ; }
YY_BREAK
case 16:
YY_RULE_SETUP
! { BEGIN INITIAL ; endString( yytext ) ; }
YY_BREAK
case 17:
case 18:
case 19:
case 20:
--- 934,959 ----
case 13:
YY_RULE_SETUP
! { generate( yytext ) ; }
YY_BREAK
case 14:
YY_RULE_SETUP
! { BEGIN INITIAL ; endString( yytext ) ; }
YY_BREAK
case 15:
YY_RULE_SETUP
! { BEGIN CHAR_STATE ; startString( yytext ); }
YY_BREAK
case 16:
YY_RULE_SETUP
! { generate( yytext ) ; }
YY_BREAK
case 17:
+ YY_RULE_SETUP
+ { generate( yytext ) ; }
+ YY_BREAK
case 18:
+ YY_RULE_SETUP
+ { BEGIN INITIAL ; endString( yytext ) ; }
+ YY_BREAK
case 19:
case 20:
***************
*** 986,994 ****
case 53:
case 54:
YY_RULE_SETUP
{ generateKeyWord( yytext ) ; }
YY_BREAK
- case 55:
- case 56:
case 57:
case 58:
--- 992,1000 ----
case 53:
case 54:
+ case 55:
+ case 56:
YY_RULE_SETUP
{ generateKeyWord( yytext ) ; }
YY_BREAK
case 57:
case 58:
***************
*** 998,1013 ****
case 62:
case 63:
YY_RULE_SETUP
{ generateBaseType( yytext ) ; }
YY_BREAK
! case 64:
YY_RULE_SETUP
{ generateNumber( yytext ) ; }
YY_BREAK
! case 65:
YY_RULE_SETUP
{ generate( yytext ) ; }
YY_BREAK
! case 66:
YY_RULE_SETUP
{
--- 1004,1021 ----
case 62:
case 63:
+ case 64:
+ case 65:
YY_RULE_SETUP
{ generateBaseType( yytext ) ; }
YY_BREAK
! case 66:
YY_RULE_SETUP
{ generateNumber( yytext ) ; }
YY_BREAK
! case 67:
YY_RULE_SETUP
{ generate( yytext ) ; }
YY_BREAK
! case 68:
YY_RULE_SETUP
{
***************
*** 1015,1023 ****
}
YY_BREAK
! case 67:
YY_RULE_SETUP
{ generate( yytext ) ; /* anything else */ }
YY_BREAK
! case 68:
YY_RULE_SETUP
{
--- 1023,1031 ----
}
YY_BREAK
! case 69:
YY_RULE_SETUP
{ generate( yytext ) ; /* anything else */ }
YY_BREAK
! case 70:
YY_RULE_SETUP
{
***************
*** 1026,1030 ****
}
YY_BREAK
! case 69:
YY_RULE_SETUP
ECHO;
--- 1034,1038 ----
}
YY_BREAK
! case 71:
YY_RULE_SETUP
ECHO;
***************
*** 1322,1326 ****
{
yy_current_state = (int) yy_def[yy_current_state];
! if ( yy_current_state >= 263 )
yy_c = yy_meta[(unsigned int) yy_c];
}
--- 1330,1334 ----
{
yy_current_state = (int) yy_def[yy_current_state];
! if ( yy_current_state >= 265 )
yy_c = yy_meta[(unsigned int) yy_c];
}
***************
*** 1352,1360 ****
{
yy_current_state = (int) yy_def[yy_current_state];
! if ( yy_current_state >= 263 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
! yy_is_jam = (yy_current_state == 262);
if ( ! yy_is_jam )
*yy_state_ptr++ = yy_current_state;
--- 1360,1368 ----
{
yy_current_state = (int) yy_def[yy_current_state];
! if ( yy_current_state >= 265 )
yy_c = yy_meta[(unsigned int) yy_c];
}
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
! yy_is_jam = (yy_current_state == 264);
if ( ! yy_is_jam )
*yy_state_ptr++ = yy_current_state;
diff -rc2P java2html-1.3/scanner.ll java2html-1.3.1/scanner.ll
*** java2html-1.3/scanner.ll Tue Sep 7 21:37:46 1999
--- java2html-1.3.1/scanner.ll Sun Nov 28 20:31:47 1999
***************
*** 84,91 ****
--- 84,93 ----
\" { BEGIN STRING_STATE ; startString( yytext ); }
+ \\\\ { generate( yytext ) ; }
"\\\"" { generate( yytext ) ; }
\" { BEGIN INITIAL ; endString( yytext ) ; }
\' { BEGIN CHAR_STATE ; startString( yytext ); }
+ \\\\ { generate( yytext ) ; }
"\\\'" { generate( yytext ) ; }
\' { BEGIN INITIAL ; endString( yytext ) ; }