diff --git a/trunk/build.xml b/trunk/build.xml index d529eda96..773b331b3 100644 --- a/trunk/build.xml +++ b/trunk/build.xml @@ -40,6 +40,11 @@ - + + + + + diff --git a/trunk/graphics/flashplayer.svg b/trunk/graphics/flashplayer.svg index e5530c3f1..a9d0f791b 100644 --- a/trunk/graphics/flashplayer.svg +++ b/trunk/graphics/flashplayer.svg @@ -16,7 +16,10 @@ inkscape:version="0.46" version="1.0" sodipodi:docname="flashplayer.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> + inkscape:output_extension="org.inkscape.output.svg.inkscape" + inkscape:export-filename="D:\Dokumenty\Programovani\JavaSE\FFDec\trunk\graphics\flashplayer256.png" + inkscape:export-xdpi="720" + inkscape:export-ydpi="720"> + inkscape:export-filename="D:\Dokumenty\WWWDokumenty\FreeDecompiler\flash\images\flattr.png" + inkscape:export-xdpi="432" + inkscape:export-ydpi="432"> + @@ -198,6 +199,27 @@ is divided into following sections: + + + + + + + + + + + + + + + + + + + + + @@ -329,41 +351,325 @@ is divided into following sections: - + + + + + + + + + + + + + + + + + + + + + + + + - - - - + - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No tests executed. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -395,10 +701,13 @@ is divided into following sections: - + Must set JVM to use for profiling in profiler.info.jvm Must set profiler agent JVM arguments in profiler.info.jvmargs.agent + @@ -456,6 +765,7 @@ is divided into following sections: + @@ -472,6 +782,7 @@ is divided into following sections: + @@ -479,6 +790,7 @@ is divided into following sections: + @@ -505,6 +817,9 @@ is divided into following sections: + + + @@ -550,7 +865,7 @@ is divided into following sections: - + - + + + This target only works when run from inside the NetBeans IDE. @@ -774,8 +1093,9 @@ is divided into following sections: - + Must select one file in the IDE or set profile.class + This target only works when run from inside the NetBeans IDE. @@ -783,12 +1103,8 @@ is divided into following sections: - - + + This target only works when run from inside the NetBeans IDE. @@ -800,12 +1116,8 @@ is divided into following sections: - - + + This target only works when run from inside the NetBeans IDE. @@ -827,6 +1139,42 @@ is divided into following sections: + + + + + + + + + + + + + + + Must select one file in the IDE or set run.class + + + + + + Must select some files in the IDE or set test.includes + + + + + Must select one file in the IDE or set run.class + + + + + Must select one file in the IDE or set applet.url + + + @@ -909,14 +1257,14 @@ is divided into following sections: - + Some tests failed; see details above. @@ -929,39 +1277,40 @@ is divided into following sections: Must select some files in the IDE or set test.includes - + Some tests failed; see details above. + + Must select some files in the IDE or set test.class + Must select some method in the IDE or set test.method + + + + Some tests failed; see details above. + + - + Must select one file in the IDE or set test.class - - - - - - - - - - - - - - - + + + + Must select one file in the IDE or set test.class + Must select some method in the IDE or set test.method + + @@ -1026,9 +1375,12 @@ is divided into following sections: - - - + + + + + + diff --git a/trunk/libsrc/jpproxy/nbproject/genfiles.properties b/trunk/libsrc/jpproxy/nbproject/genfiles.properties index 314e01228..dba5b2a05 100644 --- a/trunk/libsrc/jpproxy/nbproject/genfiles.properties +++ b/trunk/libsrc/jpproxy/nbproject/genfiles.properties @@ -4,5 +4,5 @@ nbbuild.xml.stylesheet.CRC32=28e38971@1.38.2.45 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=0a5363c8 -nbproject/build-impl.xml.script.CRC32=a674d967 -nbproject/build-impl.xml.stylesheet.CRC32=fcddb364@1.50.1.46 +nbproject/build-impl.xml.script.CRC32=949d71fd +nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46 diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/META-INF/services/jsyntaxpane/kitsfortypes.properties b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/META-INF/services/jsyntaxpane/kitsfortypes.properties index cdce4037d..5269a3218 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/META-INF/services/jsyntaxpane/kitsfortypes.properties +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/META-INF/services/jsyntaxpane/kitsfortypes.properties @@ -27,4 +27,5 @@ text/plain=jsyntaxpane.syntaxkits.PlainSyntaxKit text/flasm3=jsyntaxpane.syntaxkits.Flasm3SyntaxKit text/flasm3_methodinfo=jsyntaxpane.syntaxkits.Flasm3MethodInfoSyntaxKit text/flasm=jsyntaxpane.syntaxkits.FlasmSyntaxKit -text/actionscript=jsyntaxpane.syntaxkits.ActionScriptSyntaxKit \ No newline at end of file +text/actionscript=jsyntaxpane.syntaxkits.ActionScriptSyntaxKit +text/swf_text=jsyntaxpane.syntaxkits.SWFTextSyntaxKit \ No newline at end of file diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/DefaultSyntaxKit.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/DefaultSyntaxKit.class index 0a77e51dd..3b694c979 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/DefaultSyntaxKit.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/DefaultSyntaxKit.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/SyntaxTester.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/SyntaxTester.class index 1e9bad8d0..94c49a187 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/SyntaxTester.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/SyntaxTester.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/Token.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/Token.class index 946878c18..dcfb754eb 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/Token.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/Token.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/TokenType.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/TokenType.class index 60ddd638f..737cf0896 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/TokenType.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/TokenType.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/actions/DocumentSearchData.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/actions/DocumentSearchData.class index 5ed38b4c5..1159375fa 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/actions/DocumentSearchData.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/actions/DocumentSearchData.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/actions/gui/QuickFindDialog.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/actions/gui/QuickFindDialog.class index 3f744b223..4d103817e 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/actions/gui/QuickFindDialog.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/actions/gui/QuickFindDialog.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/ActionScriptLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/ActionScriptLexer.class index 7bf36e543..5f6c86bff 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/ActionScriptLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/ActionScriptLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/BashLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/BashLexer.class index ba00e5f98..00ab5b7e2 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/BashLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/BashLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/CLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/CLexer.class index 099925f52..08e424cd8 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/CLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/CLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/ClojureLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/ClojureLexer.class index 00431633b..4c0382e66 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/ClojureLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/ClojureLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/CppLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/CppLexer.class index 3ea83907c..332c1de1c 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/CppLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/CppLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/DOSBatchLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/DOSBatchLexer.class index cdd26f449..436c911ba 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/DOSBatchLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/DOSBatchLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/Flasm3Lexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/Flasm3Lexer.class index 35f42a03c..784d77196 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/Flasm3Lexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/Flasm3Lexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/FlasmLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/FlasmLexer.class index 06e279d97..4c10416a2 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/FlasmLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/FlasmLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/GroovyLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/GroovyLexer.class index 989c1a8ab..db9568080 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/GroovyLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/GroovyLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/JFlexLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/JFlexLexer.class index 2a9b2d4ab..a5763fa50 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/JFlexLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/JFlexLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/JavaLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/JavaLexer.class index 615da1171..4e409aa87 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/JavaLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/JavaLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/JavaScriptLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/JavaScriptLexer.class index 1ce88d708..132169237 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/JavaScriptLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/JavaScriptLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/LuaLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/LuaLexer.class index c66f361f6..bc75781a7 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/LuaLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/LuaLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/PropertiesLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/PropertiesLexer.class index e967aa5f0..1b159dd65 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/PropertiesLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/PropertiesLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/PythonLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/PythonLexer.class index 1014c4f53..a8e926fee 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/PythonLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/PythonLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/RubyLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/RubyLexer.class index ea865713f..9bfbda68a 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/RubyLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/RubyLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/ScalaLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/ScalaLexer.class index db6d5e363..2616fe1bc 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/ScalaLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/ScalaLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/SqlLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/SqlLexer.class index c170e5d45..b578d41b5 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/SqlLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/SqlLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/TALLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/TALLexer.class index 9ec89bae1..f0f39a9d8 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/TALLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/TALLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/XHTMLLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/XHTMLLexer.class index 71c5781e4..49d65b16e 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/XHTMLLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/XHTMLLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/XPathLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/XPathLexer.class index ab9ff24c6..ef8560fa4 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/XPathLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/XPathLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/XmlLexer.class b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/XmlLexer.class index eba64bf78..d1cf63905 100644 Binary files a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/XmlLexer.class and b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/classes/jsyntaxpane/lexers/XmlLexer.class differ diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/ActionScriptLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/ActionScriptLexer.java index 766aa396e..1c6201f02 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/ActionScriptLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/ActionScriptLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 28.7.10 14:58 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -19,586 +19,645 @@ package jsyntaxpane.lexers; import jsyntaxpane.Token; import jsyntaxpane.TokenType; - + /** - * This class is a scanner generated by + * This class is a scanner generated by * JFlex 1.4.3 - * on 28.7.10 14:58 from the specification file - * D:/Dokumenty/Programovani/JavaSE/ASDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/actionscript.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/actionscript.flex */ public final class ActionScriptLexer extends DefaultJFlexLexer { - /** - * This character denotes the end of file - */ - public static final int YYEOF = -1; + /** This character denotes the end of file */ + public static final int YYEOF = -1; - /** - * initial size of the lookahead buffer - */ - private static final int ZZ_BUFFERSIZE = 16384; + /** initial size of the lookahead buffer */ + private static final int ZZ_BUFFERSIZE = 16384; - /** - * lexical states - */ - public static final int STRING = 2; - public static final int YYINITIAL = 0; - public static final int CHARLITERAL = 4; + /** lexical states */ + public static final int XML = 8; + public static final int XMLSTARTTAG = 6; + public static final int STRING = 2; + public static final int YYINITIAL = 0; + public static final int CHARLITERAL = 4; - /** - * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l - * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l - * at the beginning of a line - * l is of the form l = 2*k, k a non negative integer - */ - private static final int ZZ_LEXSTATE[] = { - 0, 0, 1, 1, 2, 2 - }; + /** + * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l + * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l + * at the beginning of a line + * l is of the form l = 2*k, k a non negative integer + */ + private static final int ZZ_LEXSTATE[] = { + 0, 0, 1, 1, 2, 2, 3, 3, 4, 4 + }; - /** - * Translates characters to character classes - */ - private static final String ZZ_CMAP_PACKED = - "\11\7\1\3\1\2\1\0\1\3\1\1\16\7\4\0\1\3\1\66" + - "\1\21\1\0\1\6\1\66\1\67\1\22\1\54\1\55\1\5\1\71" + - "\1\62\1\20\1\16\1\4\1\10\3\14\4\15\2\11\1\62\1\62" + - "\1\65\1\63\1\64\1\62\1\0\3\13\1\72\1\17\1\13\7\6" + - "\1\53\11\6\1\12\2\6\1\60\1\23\1\61\1\66\1\6\1\0" + - "\1\24\1\25\1\31\1\42\1\34\1\44\1\51\1\37\1\40\1\6" + - "\1\36\1\33\1\46\1\35\1\32\1\47\1\6\1\30\1\26\1\27" + - "\1\41\1\52\1\50\1\43\1\45\1\6\1\56\1\70\1\57\1\62" + - "\41\7\2\0\4\6\4\0\1\6\2\0\1\7\7\0\1\6\4\0" + - "\1\6\5\0\27\6\1\0\37\6\1\0\u013f\6\31\0\162\6\4\0" + - "\14\6\16\0\5\6\11\0\1\6\21\0\130\7\5\0\23\7\12\0" + - "\1\6\13\0\1\6\1\0\3\6\1\0\1\6\1\0\24\6\1\0" + - "\54\6\1\0\46\6\1\0\5\6\4\0\202\6\1\0\4\7\3\0" + - "\105\6\1\0\46\6\2\0\2\6\6\0\20\6\41\0\46\6\2\0" + - "\1\6\7\0\47\6\11\0\21\7\1\0\27\7\1\0\3\7\1\0" + - "\1\7\1\0\2\7\1\0\1\7\13\0\33\6\5\0\3\6\15\0" + - "\4\7\14\0\6\7\13\0\32\6\5\0\13\6\16\7\7\0\12\7" + - "\4\0\2\6\1\7\143\6\1\0\1\6\10\7\1\0\6\7\2\6" + - "\2\7\1\0\4\7\2\6\12\7\3\6\2\0\1\6\17\0\1\7" + - "\1\6\1\7\36\6\33\7\2\0\3\6\60\0\46\6\13\7\1\6" + - "\u014f\0\3\7\66\6\2\0\1\7\1\6\20\7\2\0\1\6\4\7" + - "\3\0\12\6\2\7\2\0\12\7\21\0\3\7\1\0\10\6\2\0" + - "\2\6\2\0\26\6\1\0\7\6\1\0\1\6\3\0\4\6\2\0" + - "\1\7\1\6\7\7\2\0\2\7\2\0\3\7\11\0\1\7\4\0" + - "\2\6\1\0\3\6\2\7\2\0\12\7\4\6\15\0\3\7\1\0" + - "\6\6\4\0\2\6\2\0\26\6\1\0\7\6\1\0\2\6\1\0" + - "\2\6\1\0\2\6\2\0\1\7\1\0\5\7\4\0\2\7\2\0" + - "\3\7\13\0\4\6\1\0\1\6\7\0\14\7\3\6\14\0\3\7" + - "\1\0\11\6\1\0\3\6\1\0\26\6\1\0\7\6\1\0\2\6" + - "\1\0\5\6\2\0\1\7\1\6\10\7\1\0\3\7\1\0\3\7" + - "\2\0\1\6\17\0\2\6\2\7\2\0\12\7\1\0\1\6\17\0" + - "\3\7\1\0\10\6\2\0\2\6\2\0\26\6\1\0\7\6\1\0" + - "\2\6\1\0\5\6\2\0\1\7\1\6\6\7\3\0\2\7\2\0" + - "\3\7\10\0\2\7\4\0\2\6\1\0\3\6\4\0\12\7\1\0" + - "\1\6\20\0\1\7\1\6\1\0\6\6\3\0\3\6\1\0\4\6" + - "\3\0\2\6\1\0\1\6\1\0\2\6\3\0\2\6\3\0\3\6" + - "\3\0\10\6\1\0\3\6\4\0\5\7\3\0\3\7\1\0\4\7" + - "\11\0\1\7\17\0\11\7\11\0\1\6\7\0\3\7\1\0\10\6" + - "\1\0\3\6\1\0\27\6\1\0\12\6\1\0\5\6\4\0\7\7" + - "\1\0\3\7\1\0\4\7\7\0\2\7\11\0\2\6\4\0\12\7" + - "\22\0\2\7\1\0\10\6\1\0\3\6\1\0\27\6\1\0\12\6" + - "\1\0\5\6\2\0\1\7\1\6\7\7\1\0\3\7\1\0\4\7" + - "\7\0\2\7\7\0\1\6\1\0\2\6\4\0\12\7\22\0\2\7" + - "\1\0\10\6\1\0\3\6\1\0\27\6\1\0\20\6\4\0\6\7" + - "\2\0\3\7\1\0\4\7\11\0\1\7\10\0\2\6\4\0\12\7" + - "\22\0\2\7\1\0\22\6\3\0\30\6\1\0\11\6\1\0\1\6" + - "\2\0\7\6\3\0\1\7\4\0\6\7\1\0\1\7\1\0\10\7" + - "\22\0\2\7\15\0\60\6\1\7\2\6\7\7\4\0\10\6\10\7" + - "\1\0\12\7\47\0\2\6\1\0\1\6\2\0\2\6\1\0\1\6" + - "\2\0\1\6\6\0\4\6\1\0\7\6\1\0\3\6\1\0\1\6" + - "\1\0\1\6\2\0\2\6\1\0\4\6\1\7\2\6\6\7\1\0" + - "\2\7\1\6\2\0\5\6\1\0\1\6\1\0\6\7\2\0\12\7" + - "\2\0\2\6\42\0\1\6\27\0\2\7\6\0\12\7\13\0\1\7" + - "\1\0\1\7\1\0\1\7\4\0\2\7\10\6\1\0\42\6\6\0" + - "\24\7\1\0\2\7\4\6\4\0\10\7\1\0\44\7\11\0\1\7" + - "\71\0\42\6\1\0\5\6\1\0\2\6\1\0\7\7\3\0\4\7" + - "\6\0\12\7\6\0\6\6\4\7\106\0\46\6\12\0\51\6\7\0" + - "\132\6\5\0\104\6\5\0\122\6\6\0\7\6\1\0\77\6\1\0" + - "\1\6\1\0\4\6\2\0\7\6\1\0\1\6\1\0\4\6\2\0" + - "\47\6\1\0\1\6\1\0\4\6\2\0\37\6\1\0\1\6\1\0" + - "\4\6\2\0\7\6\1\0\1\6\1\0\4\6\2\0\7\6\1\0" + - "\7\6\1\0\27\6\1\0\37\6\1\0\1\6\1\0\4\6\2\0" + - "\7\6\1\0\47\6\1\0\23\6\16\0\11\7\56\0\125\6\14\0" + - "\u026c\6\2\0\10\6\12\0\32\6\5\0\113\6\3\0\3\6\17\0" + - "\15\6\1\0\4\6\3\7\13\0\22\6\3\7\13\0\22\6\2\7" + - "\14\0\15\6\1\0\3\6\1\0\2\7\14\0\64\6\40\7\3\0" + - "\1\6\3\0\2\6\1\7\2\0\12\7\41\0\3\7\2\0\12\7" + - "\6\0\130\6\10\0\51\6\1\7\126\0\35\6\3\0\14\7\4\0" + - "\14\7\12\0\12\7\36\6\2\0\5\6\u038b\0\154\6\224\0\234\6" + - "\4\0\132\6\6\0\26\6\2\0\6\6\2\0\46\6\2\0\6\6" + - "\2\0\10\6\1\0\1\6\1\0\1\6\1\0\1\6\1\0\37\6" + - "\2\0\65\6\1\0\7\6\1\0\1\6\3\0\3\6\1\0\7\6" + - "\3\0\4\6\2\0\6\6\4\0\15\6\5\0\3\6\1\0\7\6" + - "\17\0\4\7\32\0\5\7\20\0\2\6\23\0\1\6\13\0\4\7" + - "\6\0\6\7\1\0\1\6\15\0\1\6\40\0\22\6\36\0\15\7" + - "\4\0\1\7\3\0\6\7\27\0\1\6\4\0\1\6\2\0\12\6" + - "\1\0\1\6\3\0\5\6\6\0\1\6\1\0\1\6\1\0\1\6" + - "\1\0\4\6\1\0\3\6\1\0\7\6\3\0\3\6\5\0\5\6" + - "\26\0\44\6\u0e81\0\3\6\31\0\11\6\6\7\1\0\5\6\2\0" + - "\5\6\4\0\126\6\2\0\2\7\2\0\3\6\1\0\137\6\5\0" + - "\50\6\4\0\136\6\21\0\30\6\70\0\20\6\u0200\0\u19b6\6\112\0" + - "\u51a6\6\132\0\u048d\6\u0773\0\u2ba4\6\u215c\0\u012e\6\2\0\73\6\225\0" + - "\7\6\14\0\5\6\5\0\1\6\1\7\12\6\1\0\15\6\1\0" + - "\5\6\1\0\1\6\1\0\2\6\1\0\2\6\1\0\154\6\41\0" + - "\u016b\6\22\0\100\6\2\0\66\6\50\0\15\6\3\0\20\7\20\0" + - "\4\7\17\0\2\6\30\0\3\6\31\0\1\6\6\0\5\6\1\0" + - "\207\6\2\0\1\7\4\0\1\6\13\0\12\7\7\0\32\6\4\0" + - "\1\6\1\0\32\6\12\0\132\6\3\0\6\6\2\0\6\6\2\0" + - "\6\6\2\0\3\6\3\0\2\6\3\0\2\6\22\0\3\7\4\0"; + /** + * Translates characters to character classes + */ + private static final String ZZ_CMAP_PACKED = + "\11\7\1\3\1\2\1\0\1\3\1\1\16\7\4\0\1\14\1\67"+ + "\1\16\1\0\1\6\1\67\1\70\1\31\1\60\1\61\1\5\1\72"+ + "\1\66\1\27\1\11\1\4\1\17\3\24\4\25\2\20\1\10\1\66"+ + "\1\12\1\15\1\13\1\66\1\66\3\22\1\73\1\26\1\22\21\6"+ + "\1\21\2\6\1\64\1\30\1\65\1\67\1\6\1\0\1\34\1\32"+ + "\1\36\1\45\1\23\1\46\1\57\1\51\1\43\1\6\1\35\1\47"+ + "\1\54\1\41\1\40\1\52\1\6\1\33\1\37\1\42\1\44\1\55"+ + "\1\50\1\56\1\53\1\6\1\62\1\71\1\63\1\66\41\7\2\0"+ + "\4\6\4\0\1\6\2\0\1\7\7\0\1\6\4\0\1\6\5\0"+ + "\27\6\1\0\37\6\1\0\u013f\6\31\0\162\6\4\0\14\6\16\0"+ + "\5\6\11\0\1\6\21\0\130\7\5\0\23\7\12\0\1\6\13\0"+ + "\1\6\1\0\3\6\1\0\1\6\1\0\24\6\1\0\54\6\1\0"+ + "\46\6\1\0\5\6\4\0\202\6\1\0\4\7\3\0\105\6\1\0"+ + "\46\6\2\0\2\6\6\0\20\6\41\0\46\6\2\0\1\6\7\0"+ + "\47\6\11\0\21\7\1\0\27\7\1\0\3\7\1\0\1\7\1\0"+ + "\2\7\1\0\1\7\13\0\33\6\5\0\3\6\15\0\4\7\14\0"+ + "\6\7\13\0\32\6\5\0\13\6\16\7\7\0\12\7\4\0\2\6"+ + "\1\7\143\6\1\0\1\6\10\7\1\0\6\7\2\6\2\7\1\0"+ + "\4\7\2\6\12\7\3\6\2\0\1\6\17\0\1\7\1\6\1\7"+ + "\36\6\33\7\2\0\3\6\60\0\46\6\13\7\1\6\u014f\0\3\7"+ + "\66\6\2\0\1\7\1\6\20\7\2\0\1\6\4\7\3\0\12\6"+ + "\2\7\2\0\12\7\21\0\3\7\1\0\10\6\2\0\2\6\2\0"+ + "\26\6\1\0\7\6\1\0\1\6\3\0\4\6\2\0\1\7\1\6"+ + "\7\7\2\0\2\7\2\0\3\7\11\0\1\7\4\0\2\6\1\0"+ + "\3\6\2\7\2\0\12\7\4\6\15\0\3\7\1\0\6\6\4\0"+ + "\2\6\2\0\26\6\1\0\7\6\1\0\2\6\1\0\2\6\1\0"+ + "\2\6\2\0\1\7\1\0\5\7\4\0\2\7\2\0\3\7\13\0"+ + "\4\6\1\0\1\6\7\0\14\7\3\6\14\0\3\7\1\0\11\6"+ + "\1\0\3\6\1\0\26\6\1\0\7\6\1\0\2\6\1\0\5\6"+ + "\2\0\1\7\1\6\10\7\1\0\3\7\1\0\3\7\2\0\1\6"+ + "\17\0\2\6\2\7\2\0\12\7\1\0\1\6\17\0\3\7\1\0"+ + "\10\6\2\0\2\6\2\0\26\6\1\0\7\6\1\0\2\6\1\0"+ + "\5\6\2\0\1\7\1\6\6\7\3\0\2\7\2\0\3\7\10\0"+ + "\2\7\4\0\2\6\1\0\3\6\4\0\12\7\1\0\1\6\20\0"+ + "\1\7\1\6\1\0\6\6\3\0\3\6\1\0\4\6\3\0\2\6"+ + "\1\0\1\6\1\0\2\6\3\0\2\6\3\0\3\6\3\0\10\6"+ + "\1\0\3\6\4\0\5\7\3\0\3\7\1\0\4\7\11\0\1\7"+ + "\17\0\11\7\11\0\1\6\7\0\3\7\1\0\10\6\1\0\3\6"+ + "\1\0\27\6\1\0\12\6\1\0\5\6\4\0\7\7\1\0\3\7"+ + "\1\0\4\7\7\0\2\7\11\0\2\6\4\0\12\7\22\0\2\7"+ + "\1\0\10\6\1\0\3\6\1\0\27\6\1\0\12\6\1\0\5\6"+ + "\2\0\1\7\1\6\7\7\1\0\3\7\1\0\4\7\7\0\2\7"+ + "\7\0\1\6\1\0\2\6\4\0\12\7\22\0\2\7\1\0\10\6"+ + "\1\0\3\6\1\0\27\6\1\0\20\6\4\0\6\7\2\0\3\7"+ + "\1\0\4\7\11\0\1\7\10\0\2\6\4\0\12\7\22\0\2\7"+ + "\1\0\22\6\3\0\30\6\1\0\11\6\1\0\1\6\2\0\7\6"+ + "\3\0\1\7\4\0\6\7\1\0\1\7\1\0\10\7\22\0\2\7"+ + "\15\0\60\6\1\7\2\6\7\7\4\0\10\6\10\7\1\0\12\7"+ + "\47\0\2\6\1\0\1\6\2\0\2\6\1\0\1\6\2\0\1\6"+ + "\6\0\4\6\1\0\7\6\1\0\3\6\1\0\1\6\1\0\1\6"+ + "\2\0\2\6\1\0\4\6\1\7\2\6\6\7\1\0\2\7\1\6"+ + "\2\0\5\6\1\0\1\6\1\0\6\7\2\0\12\7\2\0\2\6"+ + "\42\0\1\6\27\0\2\7\6\0\12\7\13\0\1\7\1\0\1\7"+ + "\1\0\1\7\4\0\2\7\10\6\1\0\42\6\6\0\24\7\1\0"+ + "\2\7\4\6\4\0\10\7\1\0\44\7\11\0\1\7\71\0\42\6"+ + "\1\0\5\6\1\0\2\6\1\0\7\7\3\0\4\7\6\0\12\7"+ + "\6\0\6\6\4\7\106\0\46\6\12\0\51\6\7\0\132\6\5\0"+ + "\104\6\5\0\122\6\6\0\7\6\1\0\77\6\1\0\1\6\1\0"+ + "\4\6\2\0\7\6\1\0\1\6\1\0\4\6\2\0\47\6\1\0"+ + "\1\6\1\0\4\6\2\0\37\6\1\0\1\6\1\0\4\6\2\0"+ + "\7\6\1\0\1\6\1\0\4\6\2\0\7\6\1\0\7\6\1\0"+ + "\27\6\1\0\37\6\1\0\1\6\1\0\4\6\2\0\7\6\1\0"+ + "\47\6\1\0\23\6\16\0\11\7\56\0\125\6\14\0\u026c\6\2\0"+ + "\10\6\12\0\32\6\5\0\113\6\3\0\3\6\17\0\15\6\1\0"+ + "\4\6\3\7\13\0\22\6\3\7\13\0\22\6\2\7\14\0\15\6"+ + "\1\0\3\6\1\0\2\7\14\0\64\6\40\7\3\0\1\6\3\0"+ + "\2\6\1\7\2\0\12\7\41\0\3\7\2\0\12\7\6\0\130\6"+ + "\10\0\51\6\1\7\126\0\35\6\3\0\14\7\4\0\14\7\12\0"+ + "\12\7\36\6\2\0\5\6\u038b\0\154\6\224\0\234\6\4\0\132\6"+ + "\6\0\26\6\2\0\6\6\2\0\46\6\2\0\6\6\2\0\10\6"+ + "\1\0\1\6\1\0\1\6\1\0\1\6\1\0\37\6\2\0\65\6"+ + "\1\0\7\6\1\0\1\6\3\0\3\6\1\0\7\6\3\0\4\6"+ + "\2\0\6\6\4\0\15\6\5\0\3\6\1\0\7\6\17\0\4\7"+ + "\32\0\5\7\20\0\2\6\23\0\1\6\13\0\4\7\6\0\6\7"+ + "\1\0\1\6\15\0\1\6\40\0\22\6\36\0\15\7\4\0\1\7"+ + "\3\0\6\7\27\0\1\6\4\0\1\6\2\0\12\6\1\0\1\6"+ + "\3\0\5\6\6\0\1\6\1\0\1\6\1\0\1\6\1\0\4\6"+ + "\1\0\3\6\1\0\7\6\3\0\3\6\5\0\5\6\26\0\44\6"+ + "\u0e81\0\3\6\31\0\11\6\6\7\1\0\5\6\2\0\5\6\4\0"+ + "\126\6\2\0\2\7\2\0\3\6\1\0\137\6\5\0\50\6\4\0"+ + "\136\6\21\0\30\6\70\0\20\6\u0200\0\u19b6\6\112\0\u51a6\6\132\0"+ + "\u048d\6\u0773\0\u2ba4\6\u215c\0\u012e\6\2\0\73\6\225\0\7\6\14\0"+ + "\5\6\5\0\1\6\1\7\12\6\1\0\15\6\1\0\5\6\1\0"+ + "\1\6\1\0\2\6\1\0\2\6\1\0\154\6\41\0\u016b\6\22\0"+ + "\100\6\2\0\66\6\50\0\15\6\3\0\20\7\20\0\4\7\17\0"+ + "\2\6\30\0\3\6\31\0\1\6\6\0\5\6\1\0\207\6\2\0"+ + "\1\7\4\0\1\6\13\0\12\7\7\0\32\6\4\0\1\6\1\0"+ + "\32\6\12\0\132\6\3\0\6\6\2\0\6\6\2\0\6\6\2\0"+ + "\3\6\3\0\2\6\3\0\2\6\22\0\3\7\4\0"; - /** - * Translates characters to character classes - */ - private static final char[] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED); + /** + * Translates characters to character classes + */ + private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED); - /** - * Translates DFA states to action switch labels. - */ - private static final int[] ZZ_ACTION = zzUnpackAction(); + /** + * Translates DFA states to action switch labels. + */ + private static final int [] ZZ_ACTION = zzUnpackAction(); - private static final String ZZ_ACTION_PACKED_0 = - "\3\0\3\1\2\2\1\3\2\4\2\2\1\5\1\6" + - "\20\3\1\7\1\10\1\11\1\12\1\13\1\14\6\2" + - "\1\15\2\16\1\17\1\1\1\15\1\1\1\20\2\0" + - "\1\4\1\0\1\4\24\3\1\21\16\3\1\2\1\22" + - "\2\15\2\20\2\0\3\4\1\0\35\3\1\15\1\0" + - "\1\4\25\3\1\4\3\3\1\21\10\3\1\21\4\3" + - "\1\4\11\3\1\4\4\3\1\4\2\3\1\4\1\3"; + private static final String ZZ_ACTION_PACKED_0 = + "\5\0\3\1\2\2\1\3\4\2\1\4\2\5\1\3"+ + "\1\2\1\6\21\3\1\7\1\10\1\11\1\12\1\13"+ + "\1\14\4\2\1\15\2\16\1\17\1\1\1\15\1\1"+ + "\3\15\1\1\1\20\2\15\1\21\3\0\1\5\1\0"+ + "\1\2\2\0\1\5\4\3\1\2\16\3\2\22\17\3"+ + "\1\23\2\15\6\0\2\21\5\0\1\24\1\0\3\5"+ + "\1\0\40\3\7\0\1\3\5\0\1\5\27\3\1\15"+ + "\1\0\1\25\12\0\1\5\15\3\1\22\4\3\10\0"+ + "\1\5\10\3\2\0\1\24\1\5\3\3\1\15\1\5"+ + "\2\3\1\5"; - private static int[] zzUnpackAction() { - int[] result = new int[194]; - int offset = 0; - offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); - return result; + private static int [] zzUnpackAction() { + int [] result = new int[260]; + int offset = 0; + offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); + return result; + } + + private static int zzUnpackAction(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int count = packed.charAt(i++); + int value = packed.charAt(i++); + do result[j++] = value; while (--count > 0); } + return j; + } - private static int zzUnpackAction(String packed, int offset, int[] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - do result[j++] = value; while (--count > 0); - } - return j; + + /** + * Translates a state to a row index in the transition table + */ + private static final int [] ZZ_ROWMAP = zzUnpackRowMap(); + + private static final String ZZ_ROWMAP_PACKED_0 = + "\0\0\0\74\0\170\0\264\0\360\0\u012c\0\u0168\0\u01a4"+ + "\0\u01e0\0\u021c\0\u0258\0\u0294\0\u02d0\0\u030c\0\u0348\0\u012c"+ + "\0\u0384\0\u03c0\0\u03fc\0\u0438\0\u012c\0\u0474\0\u04b0\0\u04ec"+ + "\0\u0528\0\u0564\0\u05a0\0\u05dc\0\u0618\0\u0654\0\u0690\0\u06cc"+ + "\0\u0708\0\u0744\0\u0780\0\u07bc\0\u07f8\0\u0834\0\u012c\0\u012c"+ + "\0\u012c\0\u012c\0\u012c\0\u012c\0\u012c\0\u0870\0\u08ac\0\u08e8"+ + "\0\u0924\0\u0960\0\u012c\0\u012c\0\u099c\0\u09d8\0\u0a14\0\u0a50"+ + "\0\u012c\0\u0a8c\0\u0ac8\0\u012c\0\u0b04\0\u0b40\0\u0b7c\0\u0bb8"+ + "\0\u0bf4\0\u0c30\0\u0c6c\0\u0ca8\0\u0ce4\0\u0d20\0\u0d5c\0\u012c"+ + "\0\u0d98\0\u0dd4\0\u0e10\0\u0e4c\0\u0258\0\u0e88\0\u0ec4\0\u0f00"+ + "\0\u0f3c\0\u0f78\0\u0fb4\0\u0ff0\0\u102c\0\u1068\0\u10a4\0\u10e0"+ + "\0\u111c\0\u1158\0\u1194\0\u11d0\0\u0258\0\u120c\0\u1248\0\u1284"+ + "\0\u12c0\0\u12fc\0\u1338\0\u1374\0\u13b0\0\u13ec\0\u1428\0\u1464"+ + "\0\u14a0\0\u14dc\0\u1518\0\u1554\0\u012c\0\u1590\0\u15cc\0\u0ac8"+ + "\0\u1608\0\u1644\0\u1680\0\u16bc\0\u16f8\0\u1734\0\u012c\0\u1770"+ + "\0\u17ac\0\u17e8\0\u1824\0\u1860\0\u012c\0\u189c\0\u0d20\0\u18d8"+ + "\0\u1914\0\u1950\0\u198c\0\u19c8\0\u1a04\0\u1a40\0\u1a7c\0\u1ab8"+ + "\0\u1af4\0\u1b30\0\u1b6c\0\u1ba8\0\u1be4\0\u1c20\0\u1c5c\0\u1c98"+ + "\0\u1cd4\0\u1d10\0\u1d4c\0\u1d88\0\u1dc4\0\u1e00\0\u1e3c\0\u1e78"+ + "\0\u1eb4\0\u1ef0\0\u1f2c\0\u1f68\0\u1fa4\0\u1fe0\0\u201c\0\u2058"+ + "\0\u2094\0\u20d0\0\u210c\0\u2148\0\u2184\0\u21c0\0\u21fc\0\u2238"+ + "\0\u2274\0\u012c\0\u22b0\0\u22ec\0\u2328\0\u2364\0\u23a0\0\u23dc"+ + "\0\u2418\0\u2454\0\u2490\0\u24cc\0\u2508\0\u2544\0\u2580\0\u25bc"+ + "\0\u25f8\0\u2634\0\u2670\0\u26ac\0\u26e8\0\u2724\0\u2760\0\u279c"+ + "\0\u27d8\0\u2814\0\u2850\0\u288c\0\u28c8\0\u2904\0\u2940\0\u297c"+ + "\0\u29b8\0\u012c\0\u29f4\0\u2a30\0\u2a6c\0\u2aa8\0\u2ae4\0\u2b20"+ + "\0\u2b5c\0\u2b98\0\u2bd4\0\u2c10\0\u2c4c\0\u2c88\0\u2cc4\0\u2d00"+ + "\0\u2d3c\0\u2d78\0\u2db4\0\u2df0\0\u2e2c\0\u2e68\0\u2ea4\0\u2ee0"+ + "\0\u2f1c\0\u2f58\0\u2f94\0\u2fd0\0\u300c\0\u3048\0\u3084\0\u30c0"+ + "\0\u30fc\0\u3138\0\u3174\0\u31b0\0\u31ec\0\u3228\0\u3264\0\u32a0"+ + "\0\u32dc\0\u3318\0\u3354\0\u3390\0\u33cc\0\u3408\0\u3444\0\u3480"+ + "\0\u34bc\0\u34f8\0\u2b5c\0\u3534\0\u3570\0\u35ac\0\u35e8\0\u3138"+ + "\0\u3624\0\u3660\0\u369c\0\u36d8"; + + private static int [] zzUnpackRowMap() { + int [] result = new int[260]; + int offset = 0; + offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); + return result; + } + + private static int zzUnpackRowMap(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int high = packed.charAt(i++) << 16; + result[j++] = high | packed.charAt(i++); } + return j; + } + /** + * The transition table of the DFA + */ + private static final int [] ZZ_TRANS = zzUnpackTrans(); - /** - * Translates a state to a row index in the transition table - */ - private static final int[] ZZ_ROWMAP = zzUnpackRowMap(); + private static final String ZZ_TRANS_PACKED_0 = + "\1\6\1\7\1\6\1\10\1\11\1\12\1\13\1\6"+ + "\1\14\1\15\1\16\1\17\1\10\1\12\1\20\1\21"+ + "\1\22\2\13\1\23\2\22\1\13\1\24\1\6\1\25"+ + "\1\26\1\27\1\30\1\13\1\31\1\32\1\33\1\34"+ + "\1\35\1\36\1\37\1\40\1\41\1\42\1\43\1\13"+ + "\1\44\2\13\1\45\1\13\1\46\1\47\1\50\1\51"+ + "\1\52\1\53\1\54\1\55\1\12\1\56\1\57\1\60"+ + "\1\13\1\61\1\62\1\63\13\61\1\64\11\61\1\65"+ + "\43\61\1\66\1\62\1\63\25\66\1\67\1\64\42\66"+ + "\1\6\1\70\1\71\1\72\2\6\1\73\4\6\1\74"+ + "\1\75\4\6\3\73\2\6\1\73\3\6\26\73\13\6"+ + "\1\73\12\71\1\76\61\71\76\0\1\6\74\0\1\10"+ + "\10\0\1\10\63\0\1\77\1\100\7\0\1\55\73\0"+ + "\1\55\64\0\2\13\7\0\10\13\3\0\26\13\13\0"+ + "\1\13\10\0\1\55\74\0\1\101\1\102\4\0\2\103"+ + "\3\0\2\103\54\0\1\104\3\0\1\12\2\0\1\55"+ + "\3\0\3\104\2\0\1\104\3\0\26\104\13\0\1\104"+ + "\13\0\1\105\1\0\1\55\67\0\1\103\5\0\2\22"+ + "\1\106\1\0\1\107\2\22\1\107\16\0\1\110\10\0"+ + "\1\106\14\0\1\110\11\0\1\103\5\0\2\22\2\0"+ + "\1\107\2\22\1\107\16\0\1\110\25\0\1\110\6\0"+ + "\2\13\7\0\10\13\3\0\2\13\1\111\12\13\1\37"+ + "\6\13\1\112\1\13\13\0\1\13\15\0\1\55\11\0"+ + "\1\55\52\0\2\13\7\0\10\13\3\0\1\13\1\113"+ + "\24\13\13\0\1\13\6\0\2\13\7\0\4\13\1\114"+ + "\3\13\3\0\26\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\5\13\1\115\20\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\2\13\1\116\3\13\1\117"+ + "\6\13\1\120\10\13\13\0\1\13\6\0\2\13\7\0"+ + "\4\13\1\121\3\13\3\0\10\13\1\122\1\13\1\123"+ + "\3\13\1\124\7\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\23\13\1\125\2\13\13\0\1\13\6\0"+ + "\2\13\7\0\4\13\1\126\3\13\3\0\2\13\1\127"+ + "\7\13\1\130\13\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\1\13\1\131\15\13\1\132\1\13\1\133"+ + "\4\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\5\13\1\115\1\13\1\134\4\13\1\135\5\13\1\136"+ + "\3\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\5\13\1\137\20\13\13\0\1\13\6\0\2\13\7\0"+ + "\4\13\1\140\3\13\3\0\6\13\1\135\12\13\1\141"+ + "\4\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\2\13\1\142\3\13\1\143\2\13\1\144\1\145\13\13"+ + "\13\0\1\13\6\0\2\13\7\0\10\13\3\0\2\13"+ + "\1\146\23\13\13\0\1\13\6\0\2\13\7\0\10\13"+ + "\3\0\11\13\1\147\5\13\1\150\6\13\13\0\1\13"+ + "\6\0\2\13\7\0\10\13\3\0\1\13\1\151\1\152"+ + "\7\13\1\153\13\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\2\13\1\143\3\13\1\154\17\13\13\0"+ + "\1\13\6\0\2\13\7\0\4\13\1\121\3\13\3\0"+ + "\26\13\13\0\1\13\15\0\1\55\52\0\1\55\20\0"+ + "\1\55\53\0\1\55\17\0\1\55\54\0\1\55\1\0"+ + "\1\61\2\0\13\61\1\0\11\61\1\0\43\61\2\0"+ + "\1\63\71\0\2\155\1\0\14\155\1\156\4\155\1\156"+ + "\1\157\46\155\1\66\2\0\25\66\2\0\42\66\2\155"+ + "\1\0\71\155\2\0\1\71\74\0\1\72\10\0\1\72"+ + "\65\0\2\160\1\161\3\0\1\162\1\163\1\0\10\160"+ + "\3\0\26\160\13\0\1\160\3\0\1\72\2\0\1\160"+ + "\5\0\1\75\4\0\3\160\2\0\1\160\3\0\26\160"+ + "\13\0\1\160\4\0\1\164\1\0\1\165\12\0\3\165"+ + "\2\0\1\165\3\0\26\165\13\0\1\165\1\77\1\166"+ + "\1\167\71\77\5\170\1\171\66\170\11\0\1\55\70\0"+ + "\1\172\12\0\3\172\2\0\1\172\3\0\26\172\13\0"+ + "\1\172\17\0\2\103\2\0\1\107\2\103\1\107\16\0"+ + "\1\110\25\0\1\110\6\0\1\173\1\104\1\174\2\0"+ + "\1\175\1\176\2\0\2\104\3\173\2\104\1\173\3\0"+ + "\26\173\13\0\1\173\13\0\1\12\1\0\1\55\75\0"+ + "\1\177\1\200\1\0\5\200\3\0\1\200\1\0\1\200"+ + "\1\0\1\200\6\0\2\200\24\0\1\200\17\0\2\201"+ + "\3\0\2\201\1\0\1\202\42\0\1\202\7\0\2\13"+ + "\7\0\10\13\3\0\4\13\1\203\21\13\13\0\1\13"+ + "\6\0\2\13\7\0\10\13\3\0\10\13\1\204\15\13"+ + "\13\0\1\13\6\0\2\13\7\0\4\13\1\205\3\13"+ + "\3\0\26\13\13\0\1\13\6\0\2\13\7\0\10\13"+ + "\3\0\10\13\1\206\15\13\13\0\1\13\6\0\2\13"+ + "\7\0\10\13\3\0\5\13\1\137\2\13\1\111\15\13"+ + "\13\0\1\13\6\0\2\13\7\0\10\13\3\0\7\13"+ + "\1\207\16\13\13\0\1\13\6\0\2\13\7\0\10\13"+ + "\3\0\2\13\1\210\23\13\13\0\1\13\6\0\2\13"+ + "\7\0\10\13\3\0\10\13\1\135\15\13\13\0\1\13"+ + "\6\0\2\13\7\0\10\13\3\0\2\13\1\211\23\13"+ + "\13\0\1\13\6\0\2\13\7\0\10\13\3\0\20\13"+ + "\1\212\5\13\13\0\1\13\6\0\2\13\7\0\10\13"+ + "\3\0\11\13\1\213\14\13\13\0\1\13\6\0\2\13"+ + "\7\0\4\13\1\214\3\13\3\0\26\13\13\0\1\13"+ + "\6\0\2\13\7\0\10\13\3\0\16\13\1\115\7\13"+ + "\13\0\1\13\6\0\2\13\7\0\10\13\3\0\10\13"+ + "\1\215\11\13\1\216\3\13\13\0\1\13\6\0\2\13"+ + "\7\0\10\13\3\0\15\13\1\217\10\13\13\0\1\13"+ + "\6\0\2\13\7\0\10\13\3\0\12\13\1\137\6\13"+ + "\1\135\4\13\13\0\1\13\6\0\2\13\7\0\10\13"+ + "\3\0\1\13\1\220\7\13\1\221\14\13\13\0\1\13"+ + "\6\0\2\13\7\0\10\13\3\0\20\13\1\222\5\13"+ + "\13\0\1\13\6\0\2\13\7\0\10\13\3\0\4\13"+ + "\1\223\1\224\2\13\1\225\15\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\20\13\1\226\5\13\13\0"+ + "\1\13\6\0\2\13\7\0\4\13\1\135\3\13\3\0"+ + "\26\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\14\13\1\227\1\230\10\13\13\0\1\13\6\0\2\13"+ + "\7\0\10\13\3\0\7\13\1\231\16\13\13\0\1\13"+ + "\6\0\2\13\7\0\10\13\3\0\15\13\1\37\10\13"+ + "\13\0\1\13\6\0\2\13\7\0\10\13\3\0\1\13"+ + "\1\135\24\13\13\0\1\13\6\0\2\13\7\0\10\13"+ + "\3\0\7\13\1\232\16\13\13\0\1\13\6\0\2\13"+ + "\7\0\10\13\3\0\7\13\1\233\16\13\13\0\1\13"+ + "\6\0\2\13\7\0\10\13\3\0\1\234\25\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\10\13\1\203"+ + "\15\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\11\13\1\235\14\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\6\13\1\236\2\13\1\237\14\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\4\13\1\240"+ + "\21\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\1\241\25\13\13\0\1\13\6\0\2\13\7\0\10\13"+ + "\3\0\11\13\1\242\14\13\13\0\1\13\17\0\1\157"+ + "\4\0\2\157\65\0\1\71\4\0\2\71\54\0\1\243"+ + "\12\0\3\243\2\0\1\243\3\0\26\243\13\0\1\243"+ + "\14\0\1\162\1\163\72\0\1\163\1\0\1\244\63\0"+ + "\1\245\12\0\3\245\2\0\1\245\3\0\26\245\13\0"+ + "\1\245\6\0\1\246\1\165\1\247\2\0\1\71\1\250"+ + "\2\0\2\165\3\246\2\165\1\246\3\0\26\246\13\0"+ + "\1\246\2\0\1\167\71\0\5\170\1\251\66\170\4\0"+ + "\1\167\1\171\74\0\2\172\3\0\1\252\3\0\10\172"+ + "\3\0\26\172\13\0\1\172\6\0\2\173\1\253\2\0"+ + "\1\175\1\254\1\255\1\0\10\173\3\0\26\173\13\0"+ + "\1\173\6\0\1\256\12\0\3\256\2\0\1\256\3\0"+ + "\26\256\13\0\1\256\6\0\1\257\5\0\1\176\4\0"+ + "\3\257\2\0\1\257\3\0\26\257\13\0\1\257\17\0"+ + "\2\260\1\0\5\260\3\0\1\260\1\0\1\260\1\0"+ + "\1\260\6\0\2\260\24\0\1\260\17\0\2\201\3\0"+ + "\2\201\17\0\1\110\25\0\1\110\17\0\2\201\3\0"+ + "\2\201\54\0\2\13\7\0\10\13\3\0\17\13\1\135"+ + "\6\13\13\0\1\13\6\0\2\13\7\0\4\13\1\261"+ + "\3\13\3\0\26\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\2\13\1\262\23\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\12\13\1\263\13\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\5\13\1\121"+ + "\2\13\1\264\15\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\5\13\1\221\20\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\10\13\1\265\15\13\13\0"+ + "\1\13\6\0\2\13\7\0\4\13\1\143\3\13\3\0"+ + "\26\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\10\13\1\111\15\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\1\13\1\266\24\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\11\13\1\267\14\13\13\0"+ + "\1\13\6\0\2\13\7\0\4\13\1\270\3\13\3\0"+ + "\26\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\15\13\1\135\10\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\6\13\1\271\17\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\5\13\1\135\20\13\13\0"+ + "\1\13\6\0\2\13\7\0\4\13\1\272\3\13\3\0"+ + "\26\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\15\13\1\273\10\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\10\13\1\274\15\13\13\0\1\13\6\0"+ + "\2\13\7\0\4\13\1\275\3\13\3\0\26\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\6\13\1\276"+ + "\6\13\1\277\10\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\2\13\1\300\23\13\13\0\1\13\6\0"+ + "\2\13\7\0\4\13\1\301\3\13\3\0\26\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\2\13\1\302"+ + "\23\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\2\13\1\303\23\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\4\13\1\304\21\13\13\0\1\13\6\0"+ + "\2\13\7\0\4\13\1\217\3\13\3\0\26\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\15\13\1\137"+ + "\10\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\10\13\1\305\15\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\23\13\1\306\2\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\3\13\1\307\22\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\15\13\1\265"+ + "\10\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\13\13\1\115\12\13\13\0\1\13\6\0\2\243\4\0"+ + "\1\162\1\163\1\0\10\243\3\0\26\243\13\0\1\243"+ + "\1\244\2\0\13\244\1\310\55\244\6\0\2\245\1\311"+ + "\2\0\1\312\3\0\10\245\3\0\26\245\13\0\1\245"+ + "\6\0\2\246\1\313\2\0\1\71\1\314\1\315\1\0"+ + "\10\246\3\0\26\246\13\0\1\246\6\0\1\316\12\0"+ + "\3\316\2\0\1\316\3\0\26\316\13\0\1\316\6\0"+ + "\1\317\5\0\1\250\4\0\3\317\2\0\1\317\3\0"+ + "\26\317\13\0\1\317\4\170\1\167\1\251\66\170\6\0"+ + "\1\320\12\0\3\320\2\0\1\320\3\0\26\320\13\0"+ + "\1\320\6\0\1\257\5\0\1\254\1\255\3\0\3\257"+ + "\2\0\1\257\3\0\26\257\13\0\1\257\14\0\1\255"+ + "\1\0\1\321\63\0\1\322\1\256\3\0\1\175\1\176"+ + "\2\0\2\256\3\322\2\256\1\322\3\0\26\322\13\0"+ + "\1\322\6\0\2\257\1\323\3\0\1\324\1\255\1\0"+ + "\10\257\3\0\26\257\13\0\1\257\17\0\2\325\1\0"+ + "\5\325\3\0\1\325\1\0\1\325\1\0\1\325\6\0"+ + "\2\325\24\0\1\325\6\0\2\13\7\0\10\13\3\0"+ + "\7\13\1\326\16\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\3\13\1\135\22\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\1\13\1\327\24\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\11\13\1\330"+ + "\14\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\11\13\1\331\14\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\1\13\1\332\24\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\23\13\1\137\2\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\5\13\1\333"+ + "\20\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\16\13\1\135\7\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\6\13\1\334\17\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\12\13\1\335\13\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\2\13\1\336"+ + "\23\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\1\13\1\337\24\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\1\13\1\121\24\13\13\0\1\13\6\0"+ + "\2\13\7\0\4\13\1\340\3\13\3\0\26\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\12\13\1\341"+ + "\13\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\10\13\1\342\15\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\22\13\1\265\3\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\15\13\1\343\10\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\10\13\1\344"+ + "\15\13\13\0\1\13\6\0\2\13\7\0\4\13\1\345"+ + "\3\13\3\0\26\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\2\13\1\346\23\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\2\13\1\347\23\13\13\0"+ + "\1\13\1\244\2\0\11\244\1\310\1\244\1\310\55\244"+ + "\6\0\1\350\12\0\3\350\2\0\1\350\3\0\26\350"+ + "\13\0\1\350\6\0\1\351\12\0\3\351\2\0\1\351"+ + "\3\0\26\351\13\0\1\351\6\0\1\317\5\0\1\314"+ + "\1\315\3\0\3\317\2\0\1\317\3\0\26\317\13\0"+ + "\1\317\14\0\1\315\1\0\1\352\63\0\1\353\1\316"+ + "\3\0\1\71\1\250\2\0\2\316\3\353\2\316\1\353"+ + "\3\0\26\353\13\0\1\353\6\0\2\317\1\354\3\0"+ + "\1\355\1\315\1\0\10\317\3\0\26\317\13\0\1\317"+ + "\6\0\1\322\1\320\3\0\1\175\1\254\1\255\1\0"+ + "\2\320\3\322\2\320\1\322\3\0\26\322\13\0\1\322"+ + "\1\321\2\0\13\321\1\356\55\321\6\0\2\322\1\323"+ + "\2\0\1\175\1\254\1\255\1\0\10\322\3\0\26\322"+ + "\13\0\1\322\6\0\1\357\12\0\3\357\2\0\1\357"+ + "\3\0\26\357\13\0\1\357\14\0\1\324\1\255\75\0"+ + "\2\360\1\0\5\360\3\0\1\360\1\0\1\360\1\0"+ + "\1\360\6\0\2\360\24\0\1\360\6\0\2\13\7\0"+ + "\10\13\3\0\13\13\1\221\12\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\7\13\1\135\16\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\7\13\1\361"+ + "\16\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\4\13\1\135\21\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\11\13\1\335\14\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\20\13\1\362\5\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\14\13\1\115"+ + "\11\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\13\13\1\137\12\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\7\13\1\363\16\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\7\13\1\364\4\13\1\362"+ + "\11\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\22\13\1\365\3\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\15\13\1\121\10\13\13\0\1\13\6\0"+ + "\2\13\7\0\4\13\1\115\3\13\3\0\26\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\15\13\1\366"+ + "\10\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\11\13\1\367\14\13\13\0\1\13\6\0\2\13\7\0"+ + "\10\13\3\0\4\13\1\370\21\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\10\13\1\137\15\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\25\13\1\137"+ + "\13\0\1\13\6\0\2\350\3\0\1\312\3\0\10\350"+ + "\3\0\26\350\13\0\1\350\6\0\1\353\1\351\3\0"+ + "\1\71\1\314\1\315\1\0\2\351\3\353\2\351\1\353"+ + "\3\0\26\353\13\0\1\353\1\352\2\0\13\352\1\371"+ + "\55\352\6\0\2\353\1\354\2\0\1\71\1\314\1\315"+ + "\1\0\10\353\3\0\26\353\13\0\1\353\6\0\1\372"+ + "\12\0\3\372\2\0\1\372\3\0\26\372\13\0\1\372"+ + "\14\0\1\355\1\315\56\0\1\321\2\0\10\321\1\373"+ + "\1\356\1\321\1\356\55\321\6\0\2\357\4\0\1\324"+ + "\1\255\1\0\10\357\3\0\26\357\13\0\1\357\17\0"+ + "\2\374\1\0\5\374\3\0\1\374\1\0\1\374\1\0"+ + "\1\374\6\0\2\374\24\0\1\374\6\0\2\13\7\0"+ + "\10\13\3\0\12\13\1\137\13\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\2\13\1\375\23\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\4\13\1\222"+ + "\21\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\2\13\1\217\23\13\13\0\1\13\6\0\2\13\7\0"+ + "\4\13\1\376\3\13\3\0\26\13\13\0\1\13\6\0"+ + "\2\13\7\0\10\13\3\0\21\13\1\135\4\13\13\0"+ + "\1\13\6\0\2\13\7\0\10\13\3\0\6\13\1\327"+ + "\17\13\13\0\1\13\6\0\2\13\7\0\10\13\3\0"+ + "\10\13\1\377\15\13\13\0\1\13\1\352\2\0\10\352"+ + "\1\u0100\1\371\1\352\1\371\55\352\6\0\2\372\4\0"+ + "\1\355\1\315\1\0\10\372\3\0\26\372\13\0\1\372"+ + "\17\0\2\u0101\1\0\5\u0101\3\0\1\u0101\1\0\1\u0101"+ + "\1\0\1\u0101\6\0\2\u0101\24\0\1\u0101\6\0\2\13"+ + "\7\0\10\13\3\0\4\13\1\137\21\13\13\0\1\13"+ + "\6\0\2\13\7\0\10\13\3\0\7\13\1\u0102\16\13"+ + "\13\0\1\13\6\0\2\13\7\0\4\13\1\u0103\3\13"+ + "\3\0\26\13\13\0\1\13\17\0\2\u0104\1\0\5\u0104"+ + "\3\0\1\u0104\1\0\1\u0104\1\0\1\u0104\6\0\2\u0104"+ + "\24\0\1\u0104\6\0\2\13\7\0\10\13\3\0\10\13"+ + "\1\221\15\13\13\0\1\13\6\0\2\13\7\0\10\13"+ + "\3\0\13\13\1\135\12\13\13\0\1\13\17\0\2\110"+ + "\1\0\5\110\3\0\1\110\1\0\1\110\1\0\1\110"+ + "\6\0\2\110\24\0\1\110"; - private static final String ZZ_ROWMAP_PACKED_0 = - "\0\0\0\73\0\166\0\261\0\354\0\u0127\0\u0162\0\u019d" + - "\0\u01d8\0\u0213\0\u024e\0\u0289\0\u02c4\0\261\0\261\0\u02ff" + - "\0\u033a\0\u0375\0\u03b0\0\u03eb\0\u0426\0\u0461\0\u049c\0\u04d7" + - "\0\u0512\0\u054d\0\u0588\0\u05c3\0\u05fe\0\u0639\0\u0674\0\261" + - "\0\261\0\261\0\261\0\261\0\261\0\261\0\u06af\0\u06ea" + - "\0\u0725\0\u0760\0\u079b\0\u07d6\0\u0811\0\261\0\261\0\u084c" + - "\0\u0887\0\u08c2\0\u08fd\0\u0938\0\u0973\0\u09ae\0\u09e9\0\261" + - "\0\u0a24\0\u0a5f\0\u0a9a\0\u0ad5\0\u0b10\0\u0b4b\0\u0b86\0\u0bc1" + - "\0\u0bfc\0\u0c37\0\u0c72\0\u0cad\0\u0ce8\0\u0d23\0\u0d5e\0\u0d99" + - "\0\u0dd4\0\u0e0f\0\u0e4a\0\u0e85\0\u01d8\0\u0ec0\0\u0efb\0\u0f36" + - "\0\u0f71\0\u0fac\0\u0fe7\0\u1022\0\u105d\0\u1098\0\u10d3\0\u110e" + - "\0\u1149\0\u1184\0\u11bf\0\u11fa\0\261\0\u1235\0\u1270\0\u12ab" + - "\0\261\0\u12e6\0\u1321\0\u0973\0\u135c\0\u1397\0\u13d2\0\u140d" + - "\0\u1448\0\u1483\0\u14be\0\u14f9\0\u1534\0\u156f\0\u15aa\0\u15e5" + - "\0\u1620\0\u165b\0\u1696\0\u16d1\0\u170c\0\u1747\0\u1782\0\u17bd" + - "\0\u17f8\0\u1833\0\u186e\0\u18a9\0\u18e4\0\u191f\0\u195a\0\u1995" + - "\0\u19d0\0\u1a0b\0\u1a46\0\u1a81\0\261\0\u1abc\0\u1af7\0\u1b32" + - "\0\u1b6d\0\u1ba8\0\u1be3\0\u1c1e\0\u1c59\0\u1c94\0\u1ccf\0\u1d0a" + - "\0\u1d45\0\u1d80\0\u1dbb\0\u1df6\0\u1e31\0\u1e6c\0\u1ea7\0\u1ee2" + - "\0\u1f1d\0\u1f58\0\u1f93\0\u1fce\0\u2009\0\u2044\0\u207f\0\u20ba" + - "\0\u15e5\0\u20f5\0\u2130\0\u216b\0\u21a6\0\u21e1\0\u221c\0\u2257" + - "\0\u2292\0\u22cd\0\u2308\0\u2343\0\u237e\0\u23b9\0\u23f4\0\u242f" + - "\0\u246a\0\u24a5\0\u24e0\0\u251b\0\u2556\0\u2591\0\u25cc\0\u2607" + - "\0\u2642\0\u267d\0\u26b8\0\u26f3\0\u272e\0\u2769\0\u27a4\0\u27df" + - "\0\u281a\0\u2855"; + private static int [] zzUnpackTrans() { + int [] result = new int[14100]; + int offset = 0; + offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); + return result; + } - private static int[] zzUnpackRowMap() { - int[] result = new int[194]; - int offset = 0; - offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); - return result; + private static int zzUnpackTrans(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int count = packed.charAt(i++); + int value = packed.charAt(i++); + value--; + do result[j++] = value; while (--count > 0); } + return j; + } - private static int zzUnpackRowMap(String packed, int offset, int[] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int high = packed.charAt(i++) << 16; - result[j++] = high | packed.charAt(i++); - } - return j; + + /* error codes */ + private static final int ZZ_UNKNOWN_ERROR = 0; + private static final int ZZ_NO_MATCH = 1; + private static final int ZZ_PUSHBACK_2BIG = 2; + + /* error messages for the codes above */ + private static final String ZZ_ERROR_MSG[] = { + "Unkown internal scanner error", + "Error: could not match input", + "Error: pushback value was too large" + }; + + /** + * ZZ_ATTRIBUTE[aState] contains the attributes of state aState + */ + private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); + + private static final String ZZ_ATTRIBUTE_PACKED_0 = + "\5\0\1\11\11\1\1\11\4\1\1\11\21\1\7\11"+ + "\5\1\2\11\4\1\1\11\2\1\1\11\3\1\3\0"+ + "\1\1\1\0\1\1\2\0\1\11\44\1\1\11\2\1"+ + "\6\0\1\1\1\11\5\0\1\11\1\0\3\1\1\0"+ + "\40\1\7\0\1\11\5\0\31\1\1\0\1\11\12\0"+ + "\23\1\10\0\11\1\2\0\12\1"; + + private static int [] zzUnpackAttribute() { + int [] result = new int[260]; + int offset = 0; + offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); + return result; + } + + private static int zzUnpackAttribute(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int count = packed.charAt(i++); + int value = packed.charAt(i++); + do result[j++] = value; while (--count > 0); } + return j; + } - /** - * The transition table of the DFA - */ - private static final int[] ZZ_TRANS = zzUnpackTrans(); + /** the input device */ + private java.io.Reader zzReader; - private static final String ZZ_TRANS_PACKED_0 = - "\1\4\1\5\1\4\1\6\1\7\1\10\1\11\1\4" + - "\1\12\1\13\2\11\2\13\1\14\1\11\1\15\1\16" + - "\1\17\1\4\1\20\1\21\1\22\1\23\1\24\1\25" + - "\1\26\1\11\1\27\1\30\2\11\1\31\1\11\1\32" + - "\1\11\1\33\2\11\1\34\1\35\1\11\1\36\1\37" + - "\1\40\1\41\1\42\1\43\1\44\1\45\1\46\1\10" + - "\1\47\1\50\1\10\1\51\1\52\1\53\1\11\1\54" + - "\1\55\1\56\16\54\1\57\1\54\1\60\47\54\1\61" + - "\1\55\1\56\17\61\1\57\1\62\47\61\75\0\1\4" + - "\73\0\1\6\73\0\1\63\1\64\55\0\1\46\72\0" + - "\1\46\15\0\10\11\1\0\1\11\4\0\30\11\16\0" + - "\1\11\10\0\2\13\1\65\1\0\2\13\1\66\1\67" + - "\14\0\1\67\5\0\1\70\1\65\26\0\1\70\10\0" + - "\2\13\2\0\2\13\1\66\1\67\14\0\1\67\5\0" + - "\1\70\27\0\1\70\10\0\2\66\2\0\2\66\75\0" + - "\1\46\42\0\1\46\15\0\10\11\1\0\1\11\4\0" + - "\1\11\1\71\26\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\4\11\1\72\1\11\1\73\21\11\16\0" + - "\1\11\6\0\10\11\1\0\1\11\4\0\3\11\1\74" + - "\11\11\1\75\6\11\1\76\3\11\16\0\1\11\6\0" + - "\10\11\1\0\1\11\4\0\4\11\1\77\6\11\1\100" + - "\14\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\10\11\1\101\17\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\1\102\5\11\1\103\1\104\3\11\1\105" + - "\14\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\26\11\1\106\1\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\1\107\6\11\1\110\7\11\1\111\10\11" + - "\16\0\1\11\6\0\10\11\1\0\1\11\4\0\10\11" + - "\1\112\4\11\1\113\12\11\16\0\1\11\6\0\10\11" + - "\1\0\1\11\4\0\11\11\1\114\6\11\1\115\1\11" + - "\1\116\5\11\16\0\1\11\6\0\10\11\1\0\1\11" + - "\4\0\6\11\1\115\1\11\1\117\10\11\1\120\6\11" + - "\16\0\1\11\6\0\10\11\1\0\1\11\4\0\1\121" + - "\5\11\1\122\5\11\1\123\1\124\12\11\16\0\1\11" + - "\6\0\10\11\1\0\1\11\4\0\1\125\3\11\1\126" + - "\10\11\1\127\12\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\13\11\1\130\1\131\13\11\16\0\1\11" + - "\6\0\10\11\1\0\1\11\4\0\1\122\5\11\1\132" + - "\21\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\1\133\27\11\16\0\1\11\63\0\1\46\1\134\71\0" + - "\1\46\1\0\1\10\70\0\1\46\3\0\1\46\66\0" + - "\1\46\4\0\1\46\65\0\1\46\5\0\1\46\1\0" + - "\1\54\2\0\16\54\1\0\1\54\1\0\47\54\2\0" + - "\1\56\70\0\2\135\1\0\5\135\1\136\3\135\1\136" + - "\1\137\55\135\1\61\2\0\17\61\2\0\47\61\2\135" + - "\1\0\70\135\1\63\1\140\1\141\70\63\5\142\1\143" + - "\65\142\10\0\1\144\1\145\1\0\3\145\1\0\1\145" + - "\4\0\2\145\3\0\1\145\2\0\1\145\5\0\1\145" + - "\1\0\1\145\25\0\1\145\10\0\2\66\2\0\2\66" + - "\1\0\1\67\14\0\1\67\5\0\1\70\27\0\1\70" + - "\10\0\2\146\2\0\2\146\2\0\1\147\50\0\1\147" + - "\7\0\10\11\1\0\1\11\4\0\2\11\1\150\25\11" + - "\16\0\1\11\6\0\10\11\1\0\1\11\4\0\10\11" + - "\1\151\17\11\16\0\1\11\6\0\10\11\1\0\1\11" + - "\4\0\6\11\1\152\21\11\16\0\1\11\6\0\10\11" + - "\1\0\1\11\4\0\1\153\27\11\16\0\1\11\6\0" + - "\10\11\1\0\1\11\4\0\23\11\1\154\4\11\16\0" + - "\1\11\6\0\10\11\1\0\1\11\4\0\14\11\1\155" + - "\13\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\15\11\1\156\3\11\1\115\6\11\16\0\1\11\6\0" + - "\10\11\1\0\1\11\4\0\4\11\1\157\7\11\1\160" + - "\13\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\3\11\1\161\24\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\2\11\1\156\1\107\24\11\16\0\1\11" + - "\6\0\10\11\1\0\1\11\4\0\11\11\1\162\16\11" + - "\16\0\1\11\6\0\10\11\1\0\1\11\4\0\1\163" + - "\27\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\1\122\27\11\16\0\1\11\6\0\10\11\1\0\1\11" + - "\4\0\10\11\1\164\17\11\16\0\1\11\6\0\10\11" + - "\1\0\1\11\4\0\5\11\1\165\22\11\16\0\1\11" + - "\6\0\10\11\1\0\1\11\4\0\2\11\1\156\25\11" + - "\16\0\1\11\6\0\10\11\1\0\1\11\4\0\3\11" + - "\1\166\24\11\16\0\1\11\6\0\10\11\1\0\1\11" + - "\4\0\24\11\1\115\3\11\16\0\1\11\6\0\10\11" + - "\1\0\1\11\4\0\7\11\1\167\20\11\16\0\1\11" + - "\6\0\10\11\1\0\1\11\4\0\2\11\1\170\1\171" + - "\24\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\23\11\1\172\4\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\20\11\1\173\7\11\16\0\1\11\6\0" + - "\10\11\1\0\1\11\4\0\11\11\1\174\16\11\16\0" + - "\1\11\6\0\10\11\1\0\1\11\4\0\7\11\1\110" + - "\20\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\4\11\1\115\23\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\11\11\1\175\16\11\16\0\1\11\6\0" + - "\10\11\1\0\1\11\4\0\11\11\1\176\16\11\16\0" + - "\1\11\6\0\10\11\1\0\1\11\4\0\5\11\1\177" + - "\22\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\6\11\1\200\5\11\1\201\13\11\16\0\1\11\6\0" + - "\10\11\1\0\1\11\4\0\1\11\1\202\26\11\16\0" + - "\1\11\6\0\10\11\1\0\1\11\4\0\14\11\1\203" + - "\13\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\3\11\1\165\24\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\14\11\1\204\13\11\16\0\1\11\6\0" + - "\10\11\1\0\1\11\4\0\27\11\1\115\16\0\1\11" + - "\63\0\1\46\1\10\16\0\1\137\3\0\2\137\65\0" + - "\1\205\3\0\2\205\57\0\1\141\70\0\5\142\1\206" + - "\65\142\4\0\1\141\1\143\75\0\2\207\1\0\3\207" + - "\1\0\1\207\4\0\2\207\3\0\1\207\2\0\1\207" + - "\5\0\1\207\1\0\1\207\25\0\1\207\10\0\2\146" + - "\2\0\2\146\24\0\1\70\27\0\1\70\10\0\2\146" + - "\2\0\2\146\63\0\10\11\1\0\1\11\4\0\3\11" + - "\1\210\24\11\16\0\1\11\6\0\10\11\1\0\1\11" + - "\4\0\1\211\27\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\7\11\1\212\20\11\16\0\1\11\6\0" + - "\10\11\1\0\1\11\4\0\3\11\1\213\24\11\16\0" + - "\1\11\6\0\10\11\1\0\1\11\4\0\10\11\1\122" + - "\17\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\3\11\1\107\24\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\10\11\1\115\17\11\16\0\1\11\6\0" + - "\10\11\1\0\1\11\4\0\6\11\1\214\21\11\16\0" + - "\1\11\6\0\10\11\1\0\1\11\4\0\2\11\1\115" + - "\25\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\15\11\1\215\12\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\2\11\1\216\1\217\24\11\16\0\1\11" + - "\6\0\10\11\1\0\1\11\4\0\2\11\1\160\25\11" + - "\16\0\1\11\6\0\10\11\1\0\1\11\4\0\4\11" + - "\1\220\23\11\16\0\1\11\6\0\10\11\1\0\1\11" + - "\4\0\13\11\1\115\14\11\16\0\1\11\6\0\10\11" + - "\1\0\1\11\4\0\10\11\1\221\17\11\16\0\1\11" + - "\6\0\10\11\1\0\1\11\4\0\7\11\1\115\20\11" + - "\16\0\1\11\6\0\10\11\1\0\1\11\4\0\3\11" + - "\1\222\24\11\16\0\1\11\6\0\10\11\1\0\1\11" + - "\4\0\10\11\1\223\17\11\16\0\1\11\6\0\10\11" + - "\1\0\1\11\4\0\6\11\1\224\1\225\20\11\16\0" + - "\1\11\6\0\10\11\1\0\1\11\4\0\1\226\27\11" + - "\16\0\1\11\6\0\10\11\1\0\1\11\4\0\1\227" + - "\27\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\1\230\27\11\16\0\1\11\6\0\10\11\1\0\1\11" + - "\4\0\5\11\1\231\22\11\16\0\1\11\6\0\10\11" + - "\1\0\1\11\4\0\12\11\1\232\15\11\16\0\1\11" + - "\6\0\10\11\1\0\1\11\4\0\3\11\1\233\24\11" + - "\16\0\1\11\6\0\10\11\1\0\1\11\4\0\26\11" + - "\1\234\1\11\16\0\1\11\6\0\10\11\1\0\1\11" + - "\4\0\7\11\1\213\20\11\16\0\1\11\6\0\10\11" + - "\1\0\1\11\4\0\7\11\1\156\20\11\16\0\1\11" + - "\6\0\10\11\1\0\1\11\4\0\16\11\1\115\11\11" + - "\16\0\1\11\4\142\1\141\1\206\65\142\10\0\2\235" + - "\1\0\3\235\1\0\1\235\4\0\2\235\3\0\1\235" + - "\2\0\1\235\5\0\1\235\1\0\1\235\25\0\1\235" + - "\6\0\10\11\1\0\1\11\4\0\4\11\1\236\23\11" + - "\16\0\1\11\6\0\10\11\1\0\1\11\4\0\12\11" + - "\1\115\15\11\16\0\1\11\6\0\10\11\1\0\1\11" + - "\4\0\10\11\1\237\17\11\16\0\1\11\6\0\10\11" + - "\1\0\1\11\4\0\14\11\1\240\13\11\16\0\1\11" + - "\6\0\10\11\1\0\1\11\4\0\24\11\1\241\3\11" + - "\16\0\1\11\6\0\10\11\1\0\1\11\4\0\4\11" + - "\1\242\23\11\16\0\1\11\6\0\10\11\1\0\1\11" + - "\4\0\3\11\1\115\24\11\16\0\1\11\6\0\10\11" + - "\1\0\1\11\4\0\14\11\1\243\13\11\16\0\1\11" + - "\6\0\10\11\1\0\1\11\4\0\4\11\1\244\23\11" + - "\16\0\1\11\6\0\10\11\1\0\1\11\4\0\11\11" + - "\1\245\16\11\16\0\1\11\6\0\10\11\1\0\1\11" + - "\4\0\1\246\27\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\4\11\1\247\23\11\16\0\1\11\6\0" + - "\10\11\1\0\1\11\4\0\4\11\1\216\23\11\16\0" + - "\1\11\6\0\10\11\1\0\1\11\4\0\10\11\1\250" + - "\17\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\15\11\1\251\12\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\22\11\1\213\5\11\16\0\1\11\6\0" + - "\10\11\1\0\1\11\4\0\7\11\1\252\20\11\16\0" + - "\1\11\6\0\10\11\1\0\1\11\4\0\3\11\1\253" + - "\24\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\1\254\27\11\16\0\1\11\6\0\10\11\1\0\1\11" + - "\4\0\10\11\1\255\17\11\16\0\1\11\6\0\10\11" + - "\1\0\1\11\4\0\1\256\27\11\16\0\1\11\10\0" + - "\2\257\1\0\3\257\1\0\1\257\4\0\2\257\3\0" + - "\1\257\2\0\1\257\5\0\1\257\1\0\1\257\25\0" + - "\1\257\6\0\10\11\1\0\1\11\4\0\1\260\27\11" + - "\16\0\1\11\6\0\10\11\1\0\1\11\4\0\1\242" + - "\27\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\5\11\1\115\22\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\11\11\1\115\16\11\16\0\1\11\6\0" + - "\10\11\1\0\1\11\4\0\11\11\1\261\16\11\16\0" + - "\1\11\6\0\10\11\1\0\1\11\4\0\14\11\1\262" + - "\13\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\16\11\1\160\11\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\11\11\1\263\16\11\16\0\1\11\6\0" + - "\10\11\1\0\1\11\4\0\20\11\1\264\7\11\16\0" + - "\1\11\6\0\10\11\1\0\1\11\4\0\22\11\1\265" + - "\5\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\7\11\1\216\20\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\7\11\1\266\20\11\16\0\1\11\6\0" + - "\10\11\1\0\1\11\4\0\14\11\1\267\13\11\16\0" + - "\1\11\6\0\10\11\1\0\1\11\4\0\25\11\1\156" + - "\2\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\5\11\1\270\22\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\3\11\1\156\24\11\16\0\1\11\10\0" + - "\2\271\1\0\3\271\1\0\1\271\4\0\2\271\3\0" + - "\1\271\2\0\1\271\5\0\1\271\1\0\1\271\25\0" + - "\1\271\6\0\10\11\1\0\1\11\4\0\5\11\1\216" + - "\22\11\16\0\1\11\6\0\10\11\1\0\1\11\4\0" + - "\15\11\1\156\12\11\16\0\1\11\6\0\10\11\1\0" + - "\1\11\4\0\16\11\1\156\11\11\16\0\1\11\6\0" + - "\10\11\1\0\1\11\4\0\5\11\1\272\22\11\16\0" + - "\1\11\6\0\10\11\1\0\1\11\4\0\1\273\27\11" + - "\16\0\1\11\6\0\10\11\1\0\1\11\4\0\10\11" + - "\1\274\17\11\16\0\1\11\6\0\10\11\1\0\1\11" + - "\4\0\21\11\1\115\6\11\16\0\1\11\6\0\10\11" + - "\1\0\1\11\4\0\6\11\1\242\21\11\16\0\1\11" + - "\6\0\10\11\1\0\1\11\4\0\3\11\1\275\24\11" + - "\16\0\1\11\10\0\2\276\1\0\3\276\1\0\1\276" + - "\4\0\2\276\3\0\1\276\2\0\1\276\5\0\1\276" + - "\1\0\1\276\25\0\1\276\6\0\10\11\1\0\1\11" + - "\4\0\10\11\1\277\17\11\16\0\1\11\6\0\10\11" + - "\1\0\1\11\4\0\5\11\1\156\22\11\16\0\1\11" + - "\6\0\10\11\1\0\1\11\4\0\11\11\1\300\16\11" + - "\16\0\1\11\6\0\10\11\1\0\1\11\4\0\10\11" + - "\1\204\17\11\16\0\1\11\10\0\2\301\1\0\3\301" + - "\1\0\1\301\4\0\2\301\3\0\1\301\2\0\1\301" + - "\5\0\1\301\1\0\1\301\25\0\1\301\6\0\10\11" + - "\1\0\1\11\4\0\6\11\1\302\21\11\16\0\1\11" + - "\6\0\10\11\1\0\1\11\4\0\3\11\1\160\24\11" + - "\16\0\1\11\10\0\2\70\1\0\3\70\1\0\1\70" + - "\4\0\2\70\3\0\1\70\2\0\1\70\5\0\1\70" + - "\1\0\1\70\25\0\1\70\6\0\10\11\1\0\1\11" + - "\4\0\20\11\1\115\7\11\16\0\1\11"; + /** the current state of the DFA */ + private int zzState; - private static int[] zzUnpackTrans() { - int[] result = new int[10384]; - int offset = 0; - offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); - return result; - } + /** the current lexical state */ + private int zzLexicalState = YYINITIAL; - private static int zzUnpackTrans(String packed, int offset, int[] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - value--; - do result[j++] = value; while (--count > 0); - } - return j; - } + /** this buffer contains the current text to be matched and is + the source of the yytext() string */ + private char zzBuffer[] = new char[ZZ_BUFFERSIZE]; + /** the textposition at the last accepting state */ + private int zzMarkedPos; - /* error codes */ - private static final int ZZ_UNKNOWN_ERROR = 0; - private static final int ZZ_NO_MATCH = 1; - private static final int ZZ_PUSHBACK_2BIG = 2; + /** the current text position in the buffer */ + private int zzCurrentPos; - /* error messages for the codes above */ - private static final String ZZ_ERROR_MSG[] = { - "Unkown internal scanner error", - "Error: could not match input", - "Error: pushback value was too large" - }; + /** startRead marks the beginning of the yytext() string in the buffer */ + private int zzStartRead; - /** - * ZZ_ATTRIBUTE[aState] contains the attributes of state aState - */ - private static final int[] ZZ_ATTRIBUTE = zzUnpackAttribute(); + /** endRead marks the last character in the buffer, that has been read + from input */ + private int zzEndRead; - private static final String ZZ_ATTRIBUTE_PACKED_0 = - "\3\0\1\11\11\1\2\11\20\1\7\11\7\1\2\11" + - "\4\1\2\0\1\1\1\0\1\11\44\1\1\11\3\1" + - "\1\11\2\0\3\1\1\0\35\1\1\11\1\0\74\1"; + /** number of newlines encountered up to the start of the matched text */ + private int yyline; - private static int[] zzUnpackAttribute() { - int[] result = new int[194]; - int offset = 0; - offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); - return result; - } + /** the number of characters up to the start of the matched text */ + private int yychar; - private static int zzUnpackAttribute(String packed, int offset, int[] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - do result[j++] = value; while (--count > 0); - } - return j; - } + /** + * the number of characters from the last newline up to the start of the + * matched text + */ + private int yycolumn; - /** - * the input device - */ - private java.io.Reader zzReader; + /** + * zzAtBOL == true <=> the scanner is currently at the beginning of a line + */ + private boolean zzAtBOL = true; - /** - * the current state of the DFA - */ - private int zzState; + /** zzAtEOF == true <=> the scanner is at the EOF */ + private boolean zzAtEOF; - /** - * the current lexical state - */ - private int zzLexicalState = YYINITIAL; - - /** - * this buffer contains the current text to be matched and is - * the source of the yytext() string - */ - private char zzBuffer[] = new char[ZZ_BUFFERSIZE]; - - /** - * the textposition at the last accepting state - */ - private int zzMarkedPos; - - /** - * the current text position in the buffer - */ - private int zzCurrentPos; - - /** - * startRead marks the beginning of the yytext() string in the buffer - */ - private int zzStartRead; - - /** - * endRead marks the last character in the buffer, that has been read - * from input - */ - private int zzEndRead; - - /** - * number of newlines encountered up to the start of the matched text - */ - private int yyline; - - /** - * the number of characters up to the start of the matched text - */ - private int yychar; - - /** - * the number of characters from the last newline up to the start of the - * matched text - */ - private int yycolumn; - - /** - * zzAtBOL == true <=> the scanner is currently at the beginning of a line - */ - private boolean zzAtBOL = true; - - /** - * zzAtEOF == true <=> the scanner is at the EOF - */ - private boolean zzAtEOF; - - /** - * denotes if the user-EOF-code has already been executed - */ - private boolean zzEOFDone; - - /* user code: */ + /** denotes if the user-EOF-code has already been executed */ + private boolean zzEOFDone; + /* user code: */ /** * Create an empty lexer, yyrset will be called later to reset and assign * the reader @@ -612,414 +671,430 @@ public final class ActionScriptLexer extends DefaultJFlexLexer { return yychar; } - private static final byte PARAN = 1; - private static final byte BRACKET = 2; - private static final byte CURLY = 3; + private static final byte PARAN = 1; + private static final byte BRACKET = 2; + private static final byte CURLY = 3; + + private static String xmlTagName=""; - /** - * Creates a new scanner - * There is also a java.io.InputStream version of this constructor. - * - * @param in the java.io.Reader to read input from. - */ - public ActionScriptLexer(java.io.Reader in) { - this.zzReader = in; + + /** + * Creates a new scanner + * There is also a java.io.InputStream version of this constructor. + * + * @param in the java.io.Reader to read input from. + */ + public ActionScriptLexer(java.io.Reader in) { + this.zzReader = in; + } + + /** + * Creates a new scanner. + * There is also java.io.Reader version of this constructor. + * + * @param in the java.io.Inputstream to read input from. + */ + public ActionScriptLexer(java.io.InputStream in) { + this(new java.io.InputStreamReader(in)); + } + + /** + * Unpacks the compressed character translation table. + * + * @param packed the packed character translation table + * @return the unpacked character translation table + */ + private static char [] zzUnpackCMap(String packed) { + char [] map = new char[0x10000]; + int i = 0; /* index in packed string */ + int j = 0; /* index in unpacked array */ + while (i < 1776) { + int count = packed.charAt(i++); + char value = packed.charAt(i++); + do map[j++] = value; while (--count > 0); + } + return map; + } + + + /** + * Refills the input buffer. + * + * @return false, iff there was new input. + * + * @exception java.io.IOException if any I/O-Error occurs + */ + private boolean zzRefill() throws java.io.IOException { + + /* first: make room (if you can) */ + if (zzStartRead > 0) { + System.arraycopy(zzBuffer, zzStartRead, + zzBuffer, 0, + zzEndRead-zzStartRead); + + /* translate stored positions */ + zzEndRead-= zzStartRead; + zzCurrentPos-= zzStartRead; + zzMarkedPos-= zzStartRead; + zzStartRead = 0; } - /** - * Creates a new scanner. - * There is also java.io.Reader version of this constructor. - * - * @param in the java.io.Inputstream to read input from. - */ - public ActionScriptLexer(java.io.InputStream in) { - this(new java.io.InputStreamReader(in)); + /* is the buffer big enough? */ + if (zzCurrentPos >= zzBuffer.length) { + /* if not: blow it up */ + char newBuffer[] = new char[zzCurrentPos*2]; + System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length); + zzBuffer = newBuffer; } - /** - * Unpacks the compressed character translation table. - * - * @param packed the packed character translation table - * @return the unpacked character translation table - */ - private static char[] zzUnpackCMap(String packed) { - char[] map = new char[0x10000]; - int i = 0; /* index in packed string */ - int j = 0; /* index in unpacked array */ - while (i < 1780) { - int count = packed.charAt(i++); - char value = packed.charAt(i++); - do map[j++] = value; while (--count > 0); - } - return map; + /* finally: fill the buffer with new input */ + int numRead = zzReader.read(zzBuffer, zzEndRead, + zzBuffer.length-zzEndRead); + + if (numRead > 0) { + zzEndRead+= numRead; + return false; } - - - /** - * Refills the input buffer. - * - * @return false, iff there was new input. - * @throws java.io.IOException if any I/O-Error occurs - */ - private boolean zzRefill() throws java.io.IOException { - - /* first: make room (if you can) */ - if (zzStartRead > 0) { - System.arraycopy(zzBuffer, zzStartRead, - zzBuffer, 0, - zzEndRead - zzStartRead); - - /* translate stored positions */ - zzEndRead -= zzStartRead; - zzCurrentPos -= zzStartRead; - zzMarkedPos -= zzStartRead; - zzStartRead = 0; - } - - /* is the buffer big enough? */ - if (zzCurrentPos >= zzBuffer.length) { - /* if not: blow it up */ - char newBuffer[] = new char[zzCurrentPos * 2]; - System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length); - zzBuffer = newBuffer; - } - - /* finally: fill the buffer with new input */ - int numRead = zzReader.read(zzBuffer, zzEndRead, - zzBuffer.length - zzEndRead); - - if (numRead > 0) { - zzEndRead += numRead; - return false; - } - // unlikely but not impossible: read 0 characters, but not at end of stream - if (numRead == 0) { - int c = zzReader.read(); - if (c == -1) { - return true; - } else { - zzBuffer[zzEndRead++] = (char) c; - return false; - } - } - - // numRead < 0 + // unlikely but not impossible: read 0 characters, but not at end of stream + if (numRead == 0) { + int c = zzReader.read(); + if (c == -1) { return true; + } else { + zzBuffer[zzEndRead++] = (char) c; + return false; + } } + // numRead < 0 + return true; + } - /** - * Closes the input stream. - */ - public final void yyclose() throws java.io.IOException { - zzAtEOF = true; /* indicate end of file */ - zzEndRead = zzStartRead; /* invalidate buffer */ + + /** + * Closes the input stream. + */ + public final void yyclose() throws java.io.IOException { + zzAtEOF = true; /* indicate end of file */ + zzEndRead = zzStartRead; /* invalidate buffer */ - if (zzReader != null) - zzReader.close(); + if (zzReader != null) + zzReader.close(); + } + + + /** + * Resets the scanner to read from a new input stream. + * Does not close the old reader. + * + * All internal variables are reset, the old input stream + * cannot be reused (internal buffer is discarded and lost). + * Lexical state is set to ZZ_INITIAL. + * + * @param reader the new input stream + */ + public final void yyreset(java.io.Reader reader) { + zzReader = reader; + zzAtBOL = true; + zzAtEOF = false; + zzEOFDone = false; + zzEndRead = zzStartRead = 0; + zzCurrentPos = zzMarkedPos = 0; + yyline = yychar = yycolumn = 0; + zzLexicalState = YYINITIAL; + } + + + /** + * Returns the current lexical state. + */ + public final int yystate() { + return zzLexicalState; + } + + + /** + * Enters a new lexical state + * + * @param newState the new lexical state + */ + public final void yybegin(int newState) { + zzLexicalState = newState; + } + + + /** + * Returns the text matched by the current regular expression. + */ + public final String yytext() { + return new String( zzBuffer, zzStartRead, zzMarkedPos-zzStartRead ); + } + + + /** + * Returns the character at position pos from the + * matched text. + * + * It is equivalent to yytext().charAt(pos), but faster + * + * @param pos the position of the character to fetch. + * A value from 0 to yylength()-1. + * + * @return the character at position pos + */ + public final char yycharat(int pos) { + return zzBuffer[zzStartRead+pos]; + } + + + /** + * Returns the length of the matched text region. + */ + public final int yylength() { + return zzMarkedPos-zzStartRead; + } + + + /** + * Reports an error that occured while scanning. + * + * In a wellformed scanner (no or only correct usage of + * yypushback(int) and a match-all fallback rule) this method + * will only be called with things that "Can't Possibly Happen". + * If this method is called, something is seriously wrong + * (e.g. a JFlex bug producing a faulty scanner etc.). + * + * Usual syntax/scanner level error handling should be done + * in error fallback rules. + * + * @param errorCode the code of the errormessage to display + */ + private void zzScanError(int errorCode) { + String message; + try { + message = ZZ_ERROR_MSG[errorCode]; + } + catch (ArrayIndexOutOfBoundsException e) { + message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR]; } - - /** - * Resets the scanner to read from a new input stream. - * Does not close the old reader. - *

- * All internal variables are reset, the old input stream - * cannot be reused (internal buffer is discarded and lost). - * Lexical state is set to ZZ_INITIAL. - * - * @param reader the new input stream - */ - public final void yyreset(java.io.Reader reader) { - zzReader = reader; - zzAtBOL = true; - zzAtEOF = false; - zzEOFDone = false; - zzEndRead = zzStartRead = 0; - zzCurrentPos = zzMarkedPos = 0; - yyline = yychar = yycolumn = 0; - zzLexicalState = YYINITIAL; - } + throw new Error(message); + } - /** - * Returns the current lexical state. - */ - public final int yystate() { - return zzLexicalState; - } + /** + * Pushes the specified amount of characters back into the input stream. + * + * They will be read again by then next call of the scanning method + * + * @param number the number of characters to be read again. + * This number must not be greater than yylength()! + */ + public void yypushback(int number) { + if ( number > yylength() ) + zzScanError(ZZ_PUSHBACK_2BIG); + + zzMarkedPos -= number; + } - /** - * Enters a new lexical state - * - * @param newState the new lexical state - */ - public final void yybegin(int newState) { - zzLexicalState = newState; - } + /** + * Resumes scanning until the next regular expression is matched, + * the end of input is encountered or an I/O-Error occurs. + * + * @return the next token + * @exception java.io.IOException if any I/O-Error occurs + */ + public Token yylex() throws java.io.IOException { + int zzInput; + int zzAction; + + // cached fields: + int zzCurrentPosL; + int zzMarkedPosL; + int zzEndReadL = zzEndRead; + char [] zzBufferL = zzBuffer; + char [] zzCMapL = ZZ_CMAP; + + int [] zzTransL = ZZ_TRANS; + int [] zzRowMapL = ZZ_ROWMAP; + int [] zzAttrL = ZZ_ATTRIBUTE; + + while (true) { + zzMarkedPosL = zzMarkedPos; + + yychar+= zzMarkedPosL-zzStartRead; + + zzAction = -1; + + zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL; + + zzState = ZZ_LEXSTATE[zzLexicalState]; - /** - * Returns the text matched by the current regular expression. - */ - public final String yytext() { - return new String(zzBuffer, zzStartRead, zzMarkedPos - zzStartRead); - } - - - /** - * Returns the character at position pos from the - * matched text. - *

- * It is equivalent to yytext().charAt(pos), but faster - * - * @param pos the position of the character to fetch. - * A value from 0 to yylength()-1. - * @return the character at position pos - */ - public final char yycharat(int pos) { - return zzBuffer[zzStartRead + pos]; - } - - - /** - * Returns the length of the matched text region. - */ - public final int yylength() { - return zzMarkedPos - zzStartRead; - } - - - /** - * Reports an error that occured while scanning. - *

- * In a wellformed scanner (no or only correct usage of - * yypushback(int) and a match-all fallback rule) this method - * will only be called with things that "Can't Possibly Happen". - * If this method is called, something is seriously wrong - * (e.g. a JFlex bug producing a faulty scanner etc.). - *

- * Usual syntax/scanner level error handling should be done - * in error fallback rules. - * - * @param errorCode the code of the errormessage to display - */ - private void zzScanError(int errorCode) { - String message; - try { - message = ZZ_ERROR_MSG[errorCode]; - } - catch (ArrayIndexOutOfBoundsException e) { - message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR]; - } - - throw new Error(message); - } - - - /** - * Pushes the specified amount of characters back into the input stream. - *

- * They will be read again by then next call of the scanning method - * - * @param number the number of characters to be read again. - * This number must not be greater than yylength()! - */ - public void yypushback(int number) { - if (number > yylength()) - zzScanError(ZZ_PUSHBACK_2BIG); - - zzMarkedPos -= number; - } - - - /** - * Resumes scanning until the next regular expression is matched, - * the end of input is encountered or an I/O-Error occurs. - * - * @return the next token - * @throws java.io.IOException if any I/O-Error occurs - */ - public Token yylex() throws java.io.IOException { - int zzInput; - int zzAction; - - // cached fields: - int zzCurrentPosL; - int zzMarkedPosL; - int zzEndReadL = zzEndRead; - char[] zzBufferL = zzBuffer; - char[] zzCMapL = ZZ_CMAP; - - int[] zzTransL = ZZ_TRANS; - int[] zzRowMapL = ZZ_ROWMAP; - int[] zzAttrL = ZZ_ATTRIBUTE; - + zzForAction: { while (true) { - zzMarkedPosL = zzMarkedPos; - - yychar += zzMarkedPosL - zzStartRead; - - zzAction = -1; - - zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL; - - zzState = ZZ_LEXSTATE[zzLexicalState]; - - - zzForAction: - { - while (true) { - - if (zzCurrentPosL < zzEndReadL) - zzInput = zzBufferL[zzCurrentPosL++]; - else if (zzAtEOF) { - zzInput = YYEOF; - break zzForAction; - } else { - // store back cached positions - zzCurrentPos = zzCurrentPosL; - zzMarkedPos = zzMarkedPosL; - boolean eof = zzRefill(); - // get translated positions and possibly new buffer - zzCurrentPosL = zzCurrentPos; - zzMarkedPosL = zzMarkedPos; - zzBufferL = zzBuffer; - zzEndReadL = zzEndRead; - if (eof) { - zzInput = YYEOF; - break zzForAction; - } else { - zzInput = zzBufferL[zzCurrentPosL++]; - } - } - int zzNext = zzTransL[zzRowMapL[zzState] + zzCMapL[zzInput]]; - if (zzNext == -1) break zzForAction; - zzState = zzNext; - - int zzAttributes = zzAttrL[zzState]; - if ((zzAttributes & 1) == 1) { - zzAction = zzState; - zzMarkedPosL = zzCurrentPosL; - if ((zzAttributes & 8) == 8) break zzForAction; - } - - } + + if (zzCurrentPosL < zzEndReadL) + zzInput = zzBufferL[zzCurrentPosL++]; + else if (zzAtEOF) { + zzInput = YYEOF; + break zzForAction; + } + else { + // store back cached positions + zzCurrentPos = zzCurrentPosL; + zzMarkedPos = zzMarkedPosL; + boolean eof = zzRefill(); + // get translated positions and possibly new buffer + zzCurrentPosL = zzCurrentPos; + zzMarkedPosL = zzMarkedPos; + zzBufferL = zzBuffer; + zzEndReadL = zzEndRead; + if (eof) { + zzInput = YYEOF; + break zzForAction; } - - // store back cached position - zzMarkedPos = zzMarkedPosL; - - switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { - case 8: { - return token(TokenType.OPERATOR, -PARAN); - } - case 19: - break; - case 17: { - return token(TokenType.KEYWORD); - } - case 20: - break; - case 4: { - return token(TokenType.NUMBER); - } - case 21: - break; - case 2: { - return token(TokenType.OPERATOR); - } - case 22: - break; - case 9: { - return token(TokenType.OPERATOR, CURLY); - } - case 23: - break; - case 10: { - return token(TokenType.OPERATOR, -CURLY); - } - case 24: - break; - case 13: { - tokenLength += yylength(); - } - case 25: - break; - case 14: { - yybegin(YYINITIAL); - } - case 26: - break; - case 6: { - yybegin(CHARLITERAL); - tokenStart = yychar; - tokenLength = 1; - } - case 27: - break; - case 15: { - yybegin(YYINITIAL); - // length also includes the trailing quote - return token(TokenType.STRING, tokenStart, tokenLength + 1); - } - case 28: - break; - case 12: { - return token(TokenType.OPERATOR, -BRACKET); - } - case 29: - break; - case 7: { - return token(TokenType.OPERATOR, PARAN); - } - case 30: - break; - case 3: { - return token(TokenType.IDENTIFIER); - } - case 31: - break; - case 18: { - tokenLength += 2; - } - case 32: - break; - case 11: { - return token(TokenType.OPERATOR, BRACKET); - } - case 33: - break; - case 16: { - return token(TokenType.COMMENT); - } - case 34: - break; - case 5: { - yybegin(STRING); - tokenStart = yychar; - tokenLength = 1; - } - case 35: - break; - case 1: { - } - case 36: - break; - default: - if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { - zzAtEOF = true; - { - return null; - } - } else { - zzScanError(ZZ_NO_MATCH); - } + else { + zzInput = zzBufferL[zzCurrentPosL++]; } + } + int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ]; + if (zzNext == -1) break zzForAction; + zzState = zzNext; + + int zzAttributes = zzAttrL[zzState]; + if ( (zzAttributes & 1) == 1 ) { + zzAction = zzState; + zzMarkedPosL = zzCurrentPosL; + if ( (zzAttributes & 8) == 8 ) break zzForAction; + } + } + } + + // store back cached position + zzMarkedPos = zzMarkedPosL; + + switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { + case 8: + { return token(TokenType.OPERATOR, -PARAN); + } + case 22: break; + case 18: + { return token(TokenType.KEYWORD); + } + case 23: break; + case 5: + { return token(TokenType.NUMBER); + } + case 24: break; + case 2: + { return token(TokenType.OPERATOR); + } + case 25: break; + case 9: + { return token(TokenType.OPERATOR, CURLY); + } + case 26: break; + case 10: + { return token(TokenType.OPERATOR, -CURLY); + } + case 27: break; + case 13: + { tokenLength += yylength(); + } + case 28: break; + case 14: + { yybegin(YYINITIAL); + } + case 29: break; + case 16: + { yybegin(XML); tokenLength += yylength(); + } + case 30: break; + case 6: + { yybegin(CHARLITERAL); + tokenStart = yychar; + tokenLength = 1; + } + case 31: break; + case 21: + { tokenLength += yylength(); + String endtagname=yytext(); + endtagname=endtagname.substring(2,endtagname.length()-1); + if(endtagname.equals(xmlTagName)){ + yybegin(YYINITIAL); + return token(TokenType.STRING, tokenStart, tokenLength); + } + } + case 32: break; + case 15: + { yybegin(YYINITIAL); + // length also includes the trailing quote + return token(TokenType.STRING, tokenStart, tokenLength + 1); + } + case 33: break; + case 12: + { return token(TokenType.OPERATOR, -BRACKET); + } + case 34: break; + case 20: + { yybegin(XML); + tokenStart = yychar; + tokenLength = yylength(); + String s=yytext(); + s=s.substring(1,s.length()-1); + if(s.contains(" ")){ + s=s.substring(0,s.indexOf(" ")); + } + xmlTagName = s; + } + case 35: break; + case 7: + { return token(TokenType.OPERATOR, PARAN); + } + case 36: break; + case 3: + { return token(TokenType.IDENTIFIER); + } + case 37: break; + case 19: + { tokenLength += 2; + } + case 38: break; + case 11: + { return token(TokenType.OPERATOR, BRACKET); + } + case 39: break; + case 17: + { return token(TokenType.COMMENT); + } + case 40: break; + case 4: + { yybegin(STRING); + tokenStart = yychar; + tokenLength = 1; + } + case 41: break; + case 1: + { + } + case 42: break; + default: + if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { + zzAtEOF = true; + { + return null; + } + } + else { + zzScanError(ZZ_NO_MATCH); + } + } } + } } diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/BashLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/BashLexer.java index f26f9f904..9656d4fdd 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/BashLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/BashLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -24,8 +24,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/bash.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/bash.flex */ public final class BashLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/CLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/CLexer.java index 612f1bfad..6d8104df8 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/CLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/CLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -31,8 +31,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/c.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/c.flex */ public final class CLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/ClojureLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/ClojureLexer.java index b946071f5..462893126 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/ClojureLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/ClojureLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -24,8 +24,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/clojure.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/clojure.flex */ public final class ClojureLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/CppLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/CppLexer.java index f302a9c29..68e96d45e 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/CppLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/CppLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -31,8 +31,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/cpp.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/cpp.flex */ public final class CppLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/DOSBatchLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/DOSBatchLexer.java index 9f089216a..0434427ef 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/DOSBatchLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/DOSBatchLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -24,8 +24,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/dosbatch.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/dosbatch.flex */ public final class DOSBatchLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/Flasm3Lexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/Flasm3Lexer.java index 7e3cc070e..b110f3949 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/Flasm3Lexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/Flasm3Lexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 19.9.10 13:44 */ +/* The following code was generated by JFlex 1.4.3 on 20.3.13 20:10 */ /* Flash assembler language lexer specification */ @@ -12,8 +12,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 19.9.10 13:44 from the specification file - * D:/Dokumenty/Programovani/JavaSE/ASDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/flasm3.flex + * on 20.3.13 20:10 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/flasm3.flex */ public final class Flasm3Lexer extends DefaultJFlexLexer { @@ -141,15 +141,15 @@ public final class Flasm3Lexer extends DefaultJFlexLexer { private static final int [] ZZ_ACTION = zzUnpackAction(); private static final String ZZ_ACTION_PACKED_0 = - "\3\0\2\1\1\2\1\1\1\2\1\3\2\4\1\1"+ - "\1\5\2\6\1\7\1\10\1\7\2\1\1\11\1\12"+ - "\1\0\1\13\1\2\1\14\2\3\1\0\1\10\2\0"+ - "\2\11\1\2\1\3\1\0\1\10\1\0\1\2\1\0"+ - "\1\2\1\15\15\2\1\0\2\2\2\0\2\2\1\16"+ - "\2\2"; + "\3\0\2\1\1\2\1\1\1\2\1\3\1\4\2\5"+ + "\1\1\1\6\2\7\1\10\1\11\1\10\2\1\1\12"+ + "\1\13\1\0\1\14\1\2\2\3\1\15\2\4\1\0"+ + "\1\11\2\0\2\12\1\2\1\4\1\0\1\11\1\0"+ + "\1\2\1\0\1\2\1\16\15\2\1\0\2\2\2\0"+ + "\2\2\1\17\2\2"; private static int [] zzUnpackAction() { - int [] result = new int[66]; + int [] result = new int[69]; int offset = 0; offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); return result; @@ -175,17 +175,17 @@ public final class Flasm3Lexer extends DefaultJFlexLexer { private static final String ZZ_ROWMAP_PACKED_0 = "\0\0\0\45\0\112\0\157\0\224\0\271\0\336\0\u0103"+ - "\0\u0128\0\u014d\0\157\0\u0172\0\157\0\u0197\0\157\0\u01bc"+ - "\0\u01e1\0\u0206\0\u022b\0\u0250\0\u0275\0\157\0\336\0\157"+ - "\0\u029a\0\157\0\u02bf\0\u02e4\0\u0309\0\u032e\0\u0353\0\u0250"+ - "\0\u0378\0\157\0\u039d\0\157\0\u03c2\0\u03e7\0\u03e7\0\u040c"+ - "\0\u0431\0\u0456\0\157\0\u047b\0\u04a0\0\u04c5\0\u04ea\0\u050f"+ - "\0\u0534\0\u0559\0\u057e\0\u05a3\0\u05c8\0\u05ed\0\u0612\0\u0637"+ - "\0\u065c\0\u0681\0\u06a6\0\u06cb\0\u06f0\0\u0715\0\u073a\0\157"+ - "\0\u075f\0\u0784"; + "\0\u0128\0\u014d\0\u0172\0\157\0\u0197\0\157\0\u01bc\0\157"+ + "\0\u01e1\0\u0206\0\u022b\0\u0250\0\u0275\0\u029a\0\157\0\336"+ + "\0\157\0\u02bf\0\u02e4\0\157\0\157\0\u0309\0\u032e\0\u0353"+ + "\0\u0378\0\u039d\0\u0275\0\u03c2\0\157\0\u03e7\0\157\0\u040c"+ + "\0\u0431\0\u0431\0\u0456\0\u047b\0\u04a0\0\157\0\u04c5\0\u04ea"+ + "\0\u050f\0\u0534\0\u0559\0\u057e\0\u05a3\0\u05c8\0\u05ed\0\u0612"+ + "\0\u0637\0\u065c\0\u0681\0\u06a6\0\u06cb\0\u06f0\0\u0715\0\u073a"+ + "\0\u075f\0\u0784\0\157\0\u07a9\0\u07ce"; private static int [] zzUnpackRowMap() { - int [] result = new int[66]; + int [] result = new int[69]; int offset = 0; offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); return result; @@ -209,105 +209,106 @@ public final class Flasm3Lexer extends DefaultJFlexLexer { private static final String ZZ_TRANS_PACKED_0 = "\3\4\1\5\1\6\3\4\1\7\1\4\1\6\1\7"+ - "\4\4\1\7\1\10\4\4\13\6\1\5\1\6\2\4"+ - "\1\11\1\12\1\13\22\11\1\14\15\11\1\15\1\11"+ - "\1\4\1\16\1\17\1\4\1\20\1\4\1\21\1\4"+ - "\1\22\1\4\2\22\1\4\1\21\1\23\1\24\2\22"+ - "\1\4\1\21\1\25\1\4\13\22\1\4\1\22\1\26"+ - "\1\21\50\0\1\5\35\0\1\5\7\0\1\6\1\0"+ - "\1\6\1\0\2\27\2\6\1\30\1\6\2\0\1\27"+ - "\1\6\1\0\1\6\2\0\13\6\1\0\1\6\1\0"+ - "\1\6\4\0\1\27\1\0\1\27\1\0\4\27\1\30"+ - "\1\27\2\0\2\27\1\0\1\27\2\0\13\27\1\0"+ - "\1\27\1\0\1\27\4\0\1\6\1\0\1\6\1\0"+ - "\2\27\2\6\1\30\1\6\2\0\1\27\1\6\1\0"+ - "\1\6\2\0\1\31\12\6\1\0\1\6\1\0\1\6"+ - "\1\11\2\0\22\11\1\0\15\11\1\0\1\11\2\0"+ - "\1\13\42\0\2\32\1\0\12\32\1\33\5\32\1\34"+ - "\20\32\1\33\2\0\1\17\46\0\1\22\1\35\1\22"+ - "\1\0\4\22\1\0\1\22\2\0\2\22\1\0\1\22"+ - "\2\0\13\22\1\0\1\22\1\0\1\22\6\0\1\21"+ - "\6\0\1\21\1\0\1\36\2\37\1\0\1\21\20\0"+ - "\1\21\4\0\1\22\1\0\1\22\1\0\4\22\1\0"+ - "\1\22\2\0\2\22\1\0\1\22\2\0\13\22\1\0"+ - "\1\22\1\0\1\22\6\0\1\21\6\0\1\21\1\0"+ - "\1\40\3\0\1\21\20\0\1\21\6\0\1\36\6\0"+ - "\1\36\5\0\1\36\20\0\1\36\1\25\1\41\1\42"+ - "\42\25\4\0\1\6\1\0\1\6\1\0\2\27\2\6"+ - "\1\30\1\6\2\0\1\27\1\6\1\0\1\6\2\0"+ - "\1\6\1\43\11\6\1\0\1\6\1\0\1\6\15\0"+ - "\1\34\5\0\1\34\20\0\1\34\15\0\1\44\5\0"+ - "\1\44\20\0\1\44\6\0\1\45\6\0\1\45\5\0"+ - "\1\45\20\0\1\45\6\0\1\36\6\0\1\36\2\0"+ - "\2\37\1\0\1\36\20\0\1\36\6\0\1\46\6\0"+ - "\1\46\1\47\3\0\1\47\1\46\20\0\1\46\2\0"+ - "\1\42\46\0\1\6\1\0\1\6\1\0\2\27\2\6"+ - "\1\30\1\6\2\0\1\27\1\50\1\0\1\6\2\0"+ - "\13\6\1\0\1\6\1\0\1\6\6\0\1\45\1\51"+ - "\5\0\1\45\5\0\1\45\20\0\1\45\6\0\1\46"+ - "\6\0\1\46\5\0\1\46\20\0\1\46\4\0\1\6"+ - "\1\0\1\6\1\0\2\27\2\6\1\30\1\6\2\0"+ - "\1\27\1\6\1\0\1\6\2\0\2\6\1\52\10\6"+ - "\1\0\1\6\1\0\1\6\43\0\1\53\5\0\1\6"+ - "\1\0\1\6\1\0\2\27\2\6\1\30\1\6\2\0"+ - "\1\27\1\6\1\0\1\6\2\0\3\6\1\54\7\6"+ + "\4\4\1\7\1\10\2\4\1\11\1\4\13\6\1\5"+ + "\1\6\2\4\1\12\1\13\1\14\22\12\1\15\15\12"+ + "\1\16\1\12\1\4\1\17\1\20\1\4\1\21\1\4"+ + "\1\22\1\4\1\23\1\4\2\23\1\4\1\22\1\24"+ + "\1\25\2\23\1\4\1\22\1\26\1\4\13\23\1\4"+ + "\1\23\1\27\1\22\50\0\1\5\35\0\1\5\7\0"+ + "\1\6\1\0\1\6\1\0\2\30\2\6\1\31\1\6"+ + "\2\0\1\30\1\6\1\0\1\6\2\0\13\6\1\0"+ + "\1\6\1\0\1\6\4\0\1\30\1\0\1\30\1\0"+ + "\4\30\1\31\1\30\2\0\2\30\1\0\1\30\2\0"+ + "\13\30\1\0\1\30\1\0\1\30\4\0\1\6\1\0"+ + "\1\6\1\0\2\30\2\6\1\31\1\6\2\0\1\30"+ + "\1\6\1\0\1\6\2\0\1\32\12\6\1\0\1\6"+ + "\1\0\1\6\1\11\1\33\1\34\42\11\1\12\2\0"+ + "\22\12\1\0\15\12\1\0\1\12\2\0\1\14\42\0"+ + "\2\35\1\0\12\35\1\36\5\35\1\37\20\35\1\36"+ + "\2\0\1\20\46\0\1\23\1\40\1\23\1\0\4\23"+ + "\1\0\1\23\2\0\2\23\1\0\1\23\2\0\13\23"+ + "\1\0\1\23\1\0\1\23\6\0\1\22\6\0\1\22"+ + "\1\0\1\41\2\42\1\0\1\22\20\0\1\22\4\0"+ + "\1\23\1\0\1\23\1\0\4\23\1\0\1\23\2\0"+ + "\2\23\1\0\1\23\2\0\13\23\1\0\1\23\1\0"+ + "\1\23\6\0\1\22\6\0\1\22\1\0\1\43\3\0"+ + "\1\22\20\0\1\22\6\0\1\41\6\0\1\41\5\0"+ + "\1\41\20\0\1\41\1\26\1\44\1\45\42\26\4\0"+ + "\1\6\1\0\1\6\1\0\2\30\2\6\1\31\1\6"+ + "\2\0\1\30\1\6\1\0\1\6\2\0\1\6\1\46"+ + "\11\6\1\0\1\6\1\0\1\6\2\0\1\34\57\0"+ + "\1\37\5\0\1\37\20\0\1\37\15\0\1\47\5\0"+ + "\1\47\20\0\1\47\6\0\1\50\6\0\1\50\5\0"+ + "\1\50\20\0\1\50\6\0\1\41\6\0\1\41\2\0"+ + "\2\42\1\0\1\41\20\0\1\41\6\0\1\51\6\0"+ + "\1\51\1\52\3\0\1\52\1\51\20\0\1\51\2\0"+ + "\1\45\46\0\1\6\1\0\1\6\1\0\2\30\2\6"+ + "\1\31\1\6\2\0\1\30\1\53\1\0\1\6\2\0"+ + "\13\6\1\0\1\6\1\0\1\6\6\0\1\50\1\54"+ + "\5\0\1\50\5\0\1\50\20\0\1\50\6\0\1\51"+ + "\6\0\1\51\5\0\1\51\20\0\1\51\4\0\1\6"+ + "\1\0\1\6\1\0\2\30\2\6\1\31\1\6\2\0"+ + "\1\30\1\6\1\0\1\6\2\0\2\6\1\55\10\6"+ + "\1\0\1\6\1\0\1\6\43\0\1\56\5\0\1\6"+ + "\1\0\1\6\1\0\2\30\2\6\1\31\1\6\2\0"+ + "\1\30\1\6\1\0\1\6\2\0\3\6\1\57\7\6"+ "\1\0\1\6\1\0\1\6\4\0\1\6\1\0\1\6"+ - "\1\0\2\27\2\6\1\30\1\6\2\0\1\27\1\6"+ - "\1\0\1\6\2\0\4\6\1\55\6\6\1\0\1\6"+ - "\1\0\1\6\4\0\1\6\1\0\1\6\1\0\2\27"+ - "\2\6\1\30\1\6\2\0\1\27\1\6\1\0\1\6"+ - "\2\0\5\6\1\56\5\6\1\0\1\6\1\0\1\6"+ - "\4\0\1\6\1\0\1\6\1\0\2\27\2\6\1\30"+ - "\1\6\2\0\1\27\1\6\1\0\1\6\2\0\6\6"+ - "\1\57\4\6\1\0\1\6\1\0\1\6\4\0\1\6"+ - "\1\0\1\6\1\0\2\27\2\6\1\30\1\6\2\0"+ - "\1\27\1\60\1\0\1\6\2\0\3\6\1\61\3\6"+ - "\1\62\3\6\1\0\1\6\1\0\1\6\4\0\1\6"+ - "\1\0\1\6\1\0\2\27\2\6\1\30\1\6\2\0"+ - "\1\27\1\6\1\0\1\6\2\0\6\6\1\63\4\6"+ + "\1\0\2\30\2\6\1\31\1\6\2\0\1\30\1\6"+ + "\1\0\1\6\2\0\4\6\1\60\6\6\1\0\1\6"+ + "\1\0\1\6\4\0\1\6\1\0\1\6\1\0\2\30"+ + "\2\6\1\31\1\6\2\0\1\30\1\6\1\0\1\6"+ + "\2\0\5\6\1\61\5\6\1\0\1\6\1\0\1\6"+ + "\4\0\1\6\1\0\1\6\1\0\2\30\2\6\1\31"+ + "\1\6\2\0\1\30\1\6\1\0\1\6\2\0\6\6"+ + "\1\62\4\6\1\0\1\6\1\0\1\6\4\0\1\6"+ + "\1\0\1\6\1\0\2\30\2\6\1\31\1\6\2\0"+ + "\1\30\1\63\1\0\1\6\2\0\3\6\1\64\3\6"+ + "\1\65\3\6\1\0\1\6\1\0\1\6\4\0\1\6"+ + "\1\0\1\6\1\0\2\30\2\6\1\31\1\6\2\0"+ + "\1\30\1\6\1\0\1\6\2\0\6\6\1\66\4\6"+ "\1\0\1\6\1\0\1\6\4\0\1\6\1\0\1\6"+ - "\1\0\2\27\2\6\1\30\1\6\2\0\1\27\1\6"+ - "\1\0\1\6\2\0\10\6\1\64\2\6\1\0\1\6"+ - "\1\0\1\6\4\0\1\6\1\0\1\6\1\0\2\27"+ - "\2\6\1\30\1\6\2\0\1\27\1\6\1\0\1\6"+ - "\2\0\3\6\1\65\7\6\1\0\1\6\1\0\1\6"+ - "\4\0\1\6\1\0\1\6\1\0\2\27\2\6\1\30"+ - "\1\6\2\0\1\27\1\6\1\0\1\6\2\0\12\6"+ - "\1\66\1\0\1\6\1\0\1\6\4\0\1\6\1\0"+ - "\1\6\1\0\2\27\2\6\1\30\1\6\2\0\1\27"+ - "\1\6\1\0\1\6\2\0\11\6\1\67\1\6\1\0"+ + "\1\0\2\30\2\6\1\31\1\6\2\0\1\30\1\6"+ + "\1\0\1\6\2\0\10\6\1\67\2\6\1\0\1\6"+ + "\1\0\1\6\4\0\1\6\1\0\1\6\1\0\2\30"+ + "\2\6\1\31\1\6\2\0\1\30\1\6\1\0\1\6"+ + "\2\0\3\6\1\70\7\6\1\0\1\6\1\0\1\6"+ + "\4\0\1\6\1\0\1\6\1\0\2\30\2\6\1\31"+ + "\1\6\2\0\1\30\1\6\1\0\1\6\2\0\12\6"+ + "\1\71\1\0\1\6\1\0\1\6\4\0\1\6\1\0"+ + "\1\6\1\0\2\30\2\6\1\31\1\6\2\0\1\30"+ + "\1\6\1\0\1\6\2\0\11\6\1\72\1\6\1\0"+ "\1\6\1\0\1\6\4\0\1\6\1\0\1\6\1\0"+ - "\2\27\2\6\1\30\1\6\2\0\1\27\1\6\1\0"+ - "\1\6\2\0\10\6\1\70\2\6\1\0\1\6\1\0"+ - "\1\6\4\0\1\6\1\0\1\6\1\0\2\27\2\6"+ - "\1\30\1\6\2\0\1\27\1\6\1\0\1\6\2\0"+ - "\13\6\1\71\1\6\1\0\1\6\4\0\1\6\1\0"+ - "\1\6\1\0\2\27\2\6\1\30\1\6\2\0\1\27"+ - "\1\6\1\0\1\6\2\0\13\6\1\0\1\72\1\0"+ - "\1\6\4\0\1\6\1\0\1\6\1\0\2\27\2\6"+ - "\1\30\1\6\2\0\1\27\1\6\1\0\1\6\2\0"+ - "\11\6\1\73\1\6\1\0\1\6\1\0\1\6\6\0"+ - "\1\74\6\0\1\75\5\0\1\74\20\0\1\74\4\0"+ - "\1\6\1\0\1\6\1\0\2\27\2\6\1\30\1\6"+ - "\2\0\1\27\1\76\1\0\1\6\2\0\13\6\1\0"+ + "\2\30\2\6\1\31\1\6\2\0\1\30\1\6\1\0"+ + "\1\6\2\0\10\6\1\73\2\6\1\0\1\6\1\0"+ + "\1\6\4\0\1\6\1\0\1\6\1\0\2\30\2\6"+ + "\1\31\1\6\2\0\1\30\1\6\1\0\1\6\2\0"+ + "\13\6\1\74\1\6\1\0\1\6\4\0\1\6\1\0"+ + "\1\6\1\0\2\30\2\6\1\31\1\6\2\0\1\30"+ + "\1\6\1\0\1\6\2\0\13\6\1\0\1\75\1\0"+ + "\1\6\4\0\1\6\1\0\1\6\1\0\2\30\2\6"+ + "\1\31\1\6\2\0\1\30\1\6\1\0\1\6\2\0"+ + "\11\6\1\76\1\6\1\0\1\6\1\0\1\6\6\0"+ + "\1\77\6\0\1\100\5\0\1\77\20\0\1\77\4\0"+ + "\1\6\1\0\1\6\1\0\2\30\2\6\1\31\1\6"+ + "\2\0\1\30\1\101\1\0\1\6\2\0\13\6\1\0"+ "\1\6\1\0\1\6\4\0\1\6\1\0\1\6\1\0"+ - "\2\27\2\6\1\30\1\6\2\0\1\27\1\6\1\0"+ - "\1\6\2\0\3\6\1\77\7\6\1\0\1\6\1\0"+ - "\1\6\6\0\1\74\5\0\1\100\1\74\5\0\1\74"+ - "\20\0\1\74\14\0\1\100\34\0\1\6\1\0\1\6"+ - "\1\0\2\27\2\6\1\30\1\6\2\0\1\27\1\6"+ - "\1\0\1\6\2\0\3\6\1\66\7\6\1\0\1\6"+ - "\1\0\1\6\4\0\1\6\1\0\1\101\1\0\2\27"+ - "\2\6\1\30\1\102\2\0\1\27\1\6\1\0\1\101"+ - "\2\0\13\6\1\0\1\6\1\0\1\101\4\0\1\6"+ - "\1\0\1\101\1\0\2\27\2\6\1\100\1\101\2\0"+ - "\1\27\1\6\1\0\1\101\2\0\13\6\1\0\1\6"+ - "\1\0\1\101\4\0\1\6\1\0\1\6\1\0\2\27"+ - "\2\6\1\100\1\6\2\0\1\27\1\6\1\0\1\6"+ + "\2\30\2\6\1\31\1\6\2\0\1\30\1\6\1\0"+ + "\1\6\2\0\3\6\1\102\7\6\1\0\1\6\1\0"+ + "\1\6\6\0\1\77\5\0\1\103\1\77\5\0\1\77"+ + "\20\0\1\77\14\0\1\103\34\0\1\6\1\0\1\6"+ + "\1\0\2\30\2\6\1\31\1\6\2\0\1\30\1\6"+ + "\1\0\1\6\2\0\3\6\1\71\7\6\1\0\1\6"+ + "\1\0\1\6\4\0\1\6\1\0\1\104\1\0\2\30"+ + "\2\6\1\31\1\105\2\0\1\30\1\6\1\0\1\104"+ + "\2\0\13\6\1\0\1\6\1\0\1\104\4\0\1\6"+ + "\1\0\1\104\1\0\2\30\2\6\1\103\1\104\2\0"+ + "\1\30\1\6\1\0\1\104\2\0\13\6\1\0\1\6"+ + "\1\0\1\104\4\0\1\6\1\0\1\6\1\0\2\30"+ + "\2\6\1\103\1\6\2\0\1\30\1\6\1\0\1\6"+ "\2\0\13\6\1\0\1\6\1\0\1\6"; private static int [] zzUnpackTrans() { - int [] result = new int[1961]; + int [] result = new int[2035]; int offset = 0; offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); return result; @@ -345,14 +346,14 @@ public final class Flasm3Lexer extends DefaultJFlexLexer { private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); private static final String ZZ_ATTRIBUTE_PACKED_0 = - "\3\0\1\11\6\1\1\11\1\1\1\11\1\1\1\11"+ - "\6\1\1\11\1\0\1\11\1\1\1\11\2\1\1\0"+ + "\3\0\1\11\7\1\1\11\1\1\1\11\1\1\1\11"+ + "\6\1\1\11\1\0\1\11\2\1\2\11\2\1\1\0"+ "\1\1\2\0\1\1\1\11\1\1\1\11\1\0\1\1"+ "\1\0\1\1\1\0\1\1\1\11\15\1\1\0\2\1"+ "\2\0\2\1\1\11\2\1"; private static int [] zzUnpackAttribute() { - int [] result = new int[66]; + int [] result = new int[69]; int offset = 0; offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); return result; @@ -739,7 +740,7 @@ public final class Flasm3Lexer extends DefaultJFlexLexer { zzMarkedPos = zzMarkedPosL; switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { - case 5: + case 6: { yybegin(PARAMETERS); // length also includes the trailing quote if(isMultiname){ @@ -748,67 +749,71 @@ public final class Flasm3Lexer extends DefaultJFlexLexer { return token(TokenType.STRING, tokenStart, tokenLength + 1); } } - case 15: break; - case 9: + case 16: break; + case 10: { yybegin(YYINITIAL); return token(TokenType.COMMENT); } - case 16: break; - case 4: + case 17: break; + case 5: { yybegin(YYINITIAL); return token(TokenType.ERROR,tokenStart, tokenLength); } - case 17: break; - case 14: + case 18: break; + case 15: { return token(TokenType.KEYWORD); } - case 18: break; - case 11: + case 19: break; + case 12: { return token(TokenType.IDENTIFIER,yychar,yylength()-1); } - case 19: break; - case 10: + case 20: break; + case 11: { yybegin(STRING); tokenStart = yychar; tokenLength = 1; isMultiname=false; } - case 20: break; - case 13: + case 21: break; + case 14: { isMultiname=true; yybegin(STRING); tokenStart = yychar; tokenLength = yylength(); } - case 21: break; - case 12: + case 22: break; + case 13: { tokenLength += 2; } - case 22: break; - case 7: + case 23: break; + case 8: { return token(TokenType.IDENTIFIER); } - case 23: break; + case 24: break; case 2: { yybegin(PARAMETERS); return token(TokenType.KEYWORD); } - case 24: break; - case 8: - { return token(TokenType.NUMBER); - } case 25: break; - case 6: - { yybegin(YYINITIAL); + case 3: + { return token(TokenType.COMMENT); } case 26: break; + case 9: + { return token(TokenType.NUMBER); + } + case 27: break; + case 7: + { yybegin(YYINITIAL); + } + case 28: break; case 1: { } - case 27: break; - case 3: + case 29: break; + case 4: { tokenLength += yylength(); } - case 28: break; + case 30: break; default: if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { zzAtEOF = true; diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/Flasm3Lexer.java~ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/Flasm3Lexer.java~ index c85450b06..e4b8b8110 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/Flasm3Lexer.java~ +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/Flasm3Lexer.java~ @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 18.8.10 12:21 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* Flash assembler language lexer specification */ @@ -12,8 +12,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 18.8.10 12:21 from the specification file - * D:/Dokumenty/Programovani/JavaSE/ASDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/flasm3.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/flasm3.flex */ public final class Flasm3Lexer extends DefaultJFlexLexer { @@ -42,92 +42,93 @@ public final class Flasm3Lexer extends DefaultJFlexLexer { * Translates characters to character classes */ private static final String ZZ_CMAP_PACKED = - "\11\11\1\3\1\2\1\0\1\3\1\1\16\11\4\0\1\3\1\0"+ - "\1\26\1\0\1\10\6\0\1\22\1\0\1\16\1\17\1\0\1\15"+ - "\3\15\4\23\2\6\1\14\1\24\5\0\4\10\1\20\25\10\1\5"+ - "\1\25\1\7\1\0\1\13\1\0\4\12\1\21\7\12\1\4\15\12"+ - "\4\0\41\11\2\0\4\10\4\0\1\10\2\0\1\11\7\0\1\10"+ - "\4\0\1\10\5\0\27\10\1\0\37\10\1\0\u013f\10\31\0\162\10"+ - "\4\0\14\10\16\0\5\10\11\0\1\10\21\0\130\11\5\0\23\11"+ - "\12\0\1\10\13\0\1\10\1\0\3\10\1\0\1\10\1\0\24\10"+ - "\1\0\54\10\1\0\46\10\1\0\5\10\4\0\202\10\1\0\4\11"+ - "\3\0\105\10\1\0\46\10\2\0\2\10\6\0\20\10\41\0\46\10"+ - "\2\0\1\10\7\0\47\10\11\0\21\11\1\0\27\11\1\0\3\11"+ - "\1\0\1\11\1\0\2\11\1\0\1\11\13\0\33\10\5\0\3\10"+ - "\15\0\4\11\14\0\6\11\13\0\32\10\5\0\13\10\16\11\7\0"+ - "\12\11\4\0\2\10\1\11\143\10\1\0\1\10\10\11\1\0\6\11"+ - "\2\10\2\11\1\0\4\11\2\10\12\11\3\10\2\0\1\10\17\0"+ - "\1\11\1\10\1\11\36\10\33\11\2\0\3\10\60\0\46\10\13\11"+ - "\1\10\u014f\0\3\11\66\10\2\0\1\11\1\10\20\11\2\0\1\10"+ - "\4\11\3\0\12\10\2\11\2\0\12\11\21\0\3\11\1\0\10\10"+ - "\2\0\2\10\2\0\26\10\1\0\7\10\1\0\1\10\3\0\4\10"+ - "\2\0\1\11\1\10\7\11\2\0\2\11\2\0\3\11\11\0\1\11"+ - "\4\0\2\10\1\0\3\10\2\11\2\0\12\11\4\10\15\0\3\11"+ - "\1\0\6\10\4\0\2\10\2\0\26\10\1\0\7\10\1\0\2\10"+ - "\1\0\2\10\1\0\2\10\2\0\1\11\1\0\5\11\4\0\2\11"+ - "\2\0\3\11\13\0\4\10\1\0\1\10\7\0\14\11\3\10\14\0"+ - "\3\11\1\0\11\10\1\0\3\10\1\0\26\10\1\0\7\10\1\0"+ - "\2\10\1\0\5\10\2\0\1\11\1\10\10\11\1\0\3\11\1\0"+ - "\3\11\2\0\1\10\17\0\2\10\2\11\2\0\12\11\1\0\1\10"+ - "\17\0\3\11\1\0\10\10\2\0\2\10\2\0\26\10\1\0\7\10"+ - "\1\0\2\10\1\0\5\10\2\0\1\11\1\10\6\11\3\0\2\11"+ - "\2\0\3\11\10\0\2\11\4\0\2\10\1\0\3\10\4\0\12\11"+ - "\1\0\1\10\20\0\1\11\1\10\1\0\6\10\3\0\3\10\1\0"+ - "\4\10\3\0\2\10\1\0\1\10\1\0\2\10\3\0\2\10\3\0"+ - "\3\10\3\0\10\10\1\0\3\10\4\0\5\11\3\0\3\11\1\0"+ - "\4\11\11\0\1\11\17\0\11\11\11\0\1\10\7\0\3\11\1\0"+ - "\10\10\1\0\3\10\1\0\27\10\1\0\12\10\1\0\5\10\4\0"+ - "\7\11\1\0\3\11\1\0\4\11\7\0\2\11\11\0\2\10\4\0"+ - "\12\11\22\0\2\11\1\0\10\10\1\0\3\10\1\0\27\10\1\0"+ - "\12\10\1\0\5\10\2\0\1\11\1\10\7\11\1\0\3\11\1\0"+ - "\4\11\7\0\2\11\7\0\1\10\1\0\2\10\4\0\12\11\22\0"+ - "\2\11\1\0\10\10\1\0\3\10\1\0\27\10\1\0\20\10\4\0"+ - "\6\11\2\0\3\11\1\0\4\11\11\0\1\11\10\0\2\10\4\0"+ - "\12\11\22\0\2\11\1\0\22\10\3\0\30\10\1\0\11\10\1\0"+ - "\1\10\2\0\7\10\3\0\1\11\4\0\6\11\1\0\1\11\1\0"+ - "\10\11\22\0\2\11\15\0\60\10\1\11\2\10\7\11\4\0\10\10"+ - "\10\11\1\0\12\11\47\0\2\10\1\0\1\10\2\0\2\10\1\0"+ - "\1\10\2\0\1\10\6\0\4\10\1\0\7\10\1\0\3\10\1\0"+ - "\1\10\1\0\1\10\2\0\2\10\1\0\4\10\1\11\2\10\6\11"+ - "\1\0\2\11\1\10\2\0\5\10\1\0\1\10\1\0\6\11\2\0"+ - "\12\11\2\0\2\10\42\0\1\10\27\0\2\11\6\0\12\11\13\0"+ - "\1\11\1\0\1\11\1\0\1\11\4\0\2\11\10\10\1\0\42\10"+ - "\6\0\24\11\1\0\2\11\4\10\4\0\10\11\1\0\44\11\11\0"+ - "\1\11\71\0\42\10\1\0\5\10\1\0\2\10\1\0\7\11\3\0"+ - "\4\11\6\0\12\11\6\0\6\10\4\11\106\0\46\10\12\0\51\10"+ - "\7\0\132\10\5\0\104\10\5\0\122\10\6\0\7\10\1\0\77\10"+ - "\1\0\1\10\1\0\4\10\2\0\7\10\1\0\1\10\1\0\4\10"+ - "\2\0\47\10\1\0\1\10\1\0\4\10\2\0\37\10\1\0\1\10"+ - "\1\0\4\10\2\0\7\10\1\0\1\10\1\0\4\10\2\0\7\10"+ - "\1\0\7\10\1\0\27\10\1\0\37\10\1\0\1\10\1\0\4\10"+ - "\2\0\7\10\1\0\47\10\1\0\23\10\16\0\11\11\56\0\125\10"+ - "\14\0\u026c\10\2\0\10\10\12\0\32\10\5\0\113\10\3\0\3\10"+ - "\17\0\15\10\1\0\4\10\3\11\13\0\22\10\3\11\13\0\22\10"+ - "\2\11\14\0\15\10\1\0\3\10\1\0\2\11\14\0\64\10\40\11"+ - "\3\0\1\10\3\0\2\10\1\11\2\0\12\11\41\0\3\11\2\0"+ - "\12\11\6\0\130\10\10\0\51\10\1\11\126\0\35\10\3\0\14\11"+ - "\4\0\14\11\12\0\12\11\36\10\2\0\5\10\u038b\0\154\10\224\0"+ - "\234\10\4\0\132\10\6\0\26\10\2\0\6\10\2\0\46\10\2\0"+ - "\6\10\2\0\10\10\1\0\1\10\1\0\1\10\1\0\1\10\1\0"+ - "\37\10\2\0\65\10\1\0\7\10\1\0\1\10\3\0\3\10\1\0"+ - "\7\10\3\0\4\10\2\0\6\10\4\0\15\10\5\0\3\10\1\0"+ - "\7\10\17\0\4\11\32\0\5\11\20\0\2\10\23\0\1\10\13\0"+ - "\4\11\6\0\6\11\1\0\1\10\15\0\1\10\40\0\22\10\36\0"+ - "\15\11\4\0\1\11\3\0\6\11\27\0\1\10\4\0\1\10\2\0"+ - "\12\10\1\0\1\10\3\0\5\10\6\0\1\10\1\0\1\10\1\0"+ - "\1\10\1\0\4\10\1\0\3\10\1\0\7\10\3\0\3\10\5\0"+ - "\5\10\26\0\44\10\u0e81\0\3\10\31\0\11\10\6\11\1\0\5\10"+ - "\2\0\5\10\4\0\126\10\2\0\2\11\2\0\3\10\1\0\137\10"+ - "\5\0\50\10\4\0\136\10\21\0\30\10\70\0\20\10\u0200\0\u19b6\10"+ - "\112\0\u51a6\10\132\0\u048d\10\u0773\0\u2ba4\10\u215c\0\u012e\10\2\0\73\10"+ - "\225\0\7\10\14\0\5\10\5\0\1\10\1\11\12\10\1\0\15\10"+ - "\1\0\5\10\1\0\1\10\1\0\2\10\1\0\2\10\1\0\154\10"+ - "\41\0\u016b\10\22\0\100\10\2\0\66\10\50\0\15\10\3\0\20\11"+ - "\20\0\4\11\17\0\2\10\30\0\3\10\31\0\1\10\6\0\5\10"+ - "\1\0\207\10\2\0\1\11\4\0\1\10\13\0\12\11\7\0\32\10"+ - "\4\0\1\10\1\0\32\10\12\0\132\10\3\0\6\10\2\0\6\10"+ - "\2\0\6\10\2\0\3\10\3\0\2\10\3\0\2\10\22\0\3\11"+ - "\4\0"; + "\11\11\1\3\1\2\1\0\1\3\1\1\16\11\4\0\1\41\1\0"+ + "\1\43\1\0\1\10\6\0\1\22\1\0\1\16\1\17\1\0\1\15"+ + "\3\44\4\23\2\6\1\14\1\24\5\0\4\10\1\20\25\10\1\5"+ + "\1\25\1\7\1\0\1\13\1\0\1\36\1\12\1\27\1\40\1\21"+ + "\1\12\1\42\1\12\1\32\3\12\1\4\1\34\1\33\1\30\1\12"+ + "\1\37\1\35\1\31\3\12\1\26\2\12\4\0\41\11\2\0\4\10"+ + "\4\0\1\10\2\0\1\11\7\0\1\10\4\0\1\10\5\0\27\10"+ + "\1\0\37\10\1\0\u013f\10\31\0\162\10\4\0\14\10\16\0\5\10"+ + "\11\0\1\10\21\0\130\11\5\0\23\11\12\0\1\10\13\0\1\10"+ + "\1\0\3\10\1\0\1\10\1\0\24\10\1\0\54\10\1\0\46\10"+ + "\1\0\5\10\4\0\202\10\1\0\4\11\3\0\105\10\1\0\46\10"+ + "\2\0\2\10\6\0\20\10\41\0\46\10\2\0\1\10\7\0\47\10"+ + "\11\0\21\11\1\0\27\11\1\0\3\11\1\0\1\11\1\0\2\11"+ + "\1\0\1\11\13\0\33\10\5\0\3\10\15\0\4\11\14\0\6\11"+ + "\13\0\32\10\5\0\13\10\16\11\7\0\12\11\4\0\2\10\1\11"+ + "\143\10\1\0\1\10\10\11\1\0\6\11\2\10\2\11\1\0\4\11"+ + "\2\10\12\11\3\10\2\0\1\10\17\0\1\11\1\10\1\11\36\10"+ + "\33\11\2\0\3\10\60\0\46\10\13\11\1\10\u014f\0\3\11\66\10"+ + "\2\0\1\11\1\10\20\11\2\0\1\10\4\11\3\0\12\10\2\11"+ + "\2\0\12\11\21\0\3\11\1\0\10\10\2\0\2\10\2\0\26\10"+ + "\1\0\7\10\1\0\1\10\3\0\4\10\2\0\1\11\1\10\7\11"+ + "\2\0\2\11\2\0\3\11\11\0\1\11\4\0\2\10\1\0\3\10"+ + "\2\11\2\0\12\11\4\10\15\0\3\11\1\0\6\10\4\0\2\10"+ + "\2\0\26\10\1\0\7\10\1\0\2\10\1\0\2\10\1\0\2\10"+ + "\2\0\1\11\1\0\5\11\4\0\2\11\2\0\3\11\13\0\4\10"+ + "\1\0\1\10\7\0\14\11\3\10\14\0\3\11\1\0\11\10\1\0"+ + "\3\10\1\0\26\10\1\0\7\10\1\0\2\10\1\0\5\10\2\0"+ + "\1\11\1\10\10\11\1\0\3\11\1\0\3\11\2\0\1\10\17\0"+ + "\2\10\2\11\2\0\12\11\1\0\1\10\17\0\3\11\1\0\10\10"+ + "\2\0\2\10\2\0\26\10\1\0\7\10\1\0\2\10\1\0\5\10"+ + "\2\0\1\11\1\10\6\11\3\0\2\11\2\0\3\11\10\0\2\11"+ + "\4\0\2\10\1\0\3\10\4\0\12\11\1\0\1\10\20\0\1\11"+ + "\1\10\1\0\6\10\3\0\3\10\1\0\4\10\3\0\2\10\1\0"+ + "\1\10\1\0\2\10\3\0\2\10\3\0\3\10\3\0\10\10\1\0"+ + "\3\10\4\0\5\11\3\0\3\11\1\0\4\11\11\0\1\11\17\0"+ + "\11\11\11\0\1\10\7\0\3\11\1\0\10\10\1\0\3\10\1\0"+ + "\27\10\1\0\12\10\1\0\5\10\4\0\7\11\1\0\3\11\1\0"+ + "\4\11\7\0\2\11\11\0\2\10\4\0\12\11\22\0\2\11\1\0"+ + "\10\10\1\0\3\10\1\0\27\10\1\0\12\10\1\0\5\10\2\0"+ + "\1\11\1\10\7\11\1\0\3\11\1\0\4\11\7\0\2\11\7\0"+ + "\1\10\1\0\2\10\4\0\12\11\22\0\2\11\1\0\10\10\1\0"+ + "\3\10\1\0\27\10\1\0\20\10\4\0\6\11\2\0\3\11\1\0"+ + "\4\11\11\0\1\11\10\0\2\10\4\0\12\11\22\0\2\11\1\0"+ + "\22\10\3\0\30\10\1\0\11\10\1\0\1\10\2\0\7\10\3\0"+ + "\1\11\4\0\6\11\1\0\1\11\1\0\10\11\22\0\2\11\15\0"+ + "\60\10\1\11\2\10\7\11\4\0\10\10\10\11\1\0\12\11\47\0"+ + "\2\10\1\0\1\10\2\0\2\10\1\0\1\10\2\0\1\10\6\0"+ + "\4\10\1\0\7\10\1\0\3\10\1\0\1\10\1\0\1\10\2\0"+ + "\2\10\1\0\4\10\1\11\2\10\6\11\1\0\2\11\1\10\2\0"+ + "\5\10\1\0\1\10\1\0\6\11\2\0\12\11\2\0\2\10\42\0"+ + "\1\10\27\0\2\11\6\0\12\11\13\0\1\11\1\0\1\11\1\0"+ + "\1\11\4\0\2\11\10\10\1\0\42\10\6\0\24\11\1\0\2\11"+ + "\4\10\4\0\10\11\1\0\44\11\11\0\1\11\71\0\42\10\1\0"+ + "\5\10\1\0\2\10\1\0\7\11\3\0\4\11\6\0\12\11\6\0"+ + "\6\10\4\11\106\0\46\10\12\0\51\10\7\0\132\10\5\0\104\10"+ + "\5\0\122\10\6\0\7\10\1\0\77\10\1\0\1\10\1\0\4\10"+ + "\2\0\7\10\1\0\1\10\1\0\4\10\2\0\47\10\1\0\1\10"+ + "\1\0\4\10\2\0\37\10\1\0\1\10\1\0\4\10\2\0\7\10"+ + "\1\0\1\10\1\0\4\10\2\0\7\10\1\0\7\10\1\0\27\10"+ + "\1\0\37\10\1\0\1\10\1\0\4\10\2\0\7\10\1\0\47\10"+ + "\1\0\23\10\16\0\11\11\56\0\125\10\14\0\u026c\10\2\0\10\10"+ + "\12\0\32\10\5\0\113\10\3\0\3\10\17\0\15\10\1\0\4\10"+ + "\3\11\13\0\22\10\3\11\13\0\22\10\2\11\14\0\15\10\1\0"+ + "\3\10\1\0\2\11\14\0\64\10\40\11\3\0\1\10\3\0\2\10"+ + "\1\11\2\0\12\11\41\0\3\11\2\0\12\11\6\0\130\10\10\0"+ + "\51\10\1\11\126\0\35\10\3\0\14\11\4\0\14\11\12\0\12\11"+ + "\36\10\2\0\5\10\u038b\0\154\10\224\0\234\10\4\0\132\10\6\0"+ + "\26\10\2\0\6\10\2\0\46\10\2\0\6\10\2\0\10\10\1\0"+ + "\1\10\1\0\1\10\1\0\1\10\1\0\37\10\2\0\65\10\1\0"+ + "\7\10\1\0\1\10\3\0\3\10\1\0\7\10\3\0\4\10\2\0"+ + "\6\10\4\0\15\10\5\0\3\10\1\0\7\10\17\0\4\11\32\0"+ + "\5\11\20\0\2\10\23\0\1\10\13\0\4\11\6\0\6\11\1\0"+ + "\1\10\15\0\1\10\40\0\22\10\36\0\15\11\4\0\1\11\3\0"+ + "\6\11\27\0\1\10\4\0\1\10\2\0\12\10\1\0\1\10\3\0"+ + "\5\10\6\0\1\10\1\0\1\10\1\0\1\10\1\0\4\10\1\0"+ + "\3\10\1\0\7\10\3\0\3\10\5\0\5\10\26\0\44\10\u0e81\0"+ + "\3\10\31\0\11\10\6\11\1\0\5\10\2\0\5\10\4\0\126\10"+ + "\2\0\2\11\2\0\3\10\1\0\137\10\5\0\50\10\4\0\136\10"+ + "\21\0\30\10\70\0\20\10\u0200\0\u19b6\10\112\0\u51a6\10\132\0\u048d\10"+ + "\u0773\0\u2ba4\10\u215c\0\u012e\10\2\0\73\10\225\0\7\10\14\0\5\10"+ + "\5\0\1\10\1\11\12\10\1\0\15\10\1\0\5\10\1\0\1\10"+ + "\1\0\2\10\1\0\2\10\1\0\154\10\41\0\u016b\10\22\0\100\10"+ + "\2\0\66\10\50\0\15\10\3\0\20\11\20\0\4\11\17\0\2\10"+ + "\30\0\3\10\31\0\1\10\6\0\5\10\1\0\207\10\2\0\1\11"+ + "\4\0\1\10\13\0\12\11\7\0\32\10\4\0\1\10\1\0\32\10"+ + "\12\0\132\10\3\0\6\10\2\0\6\10\2\0\6\10\2\0\3\10"+ + "\3\0\2\10\3\0\2\10\22\0\3\11\4\0"; /** * Translates characters to character classes @@ -140,13 +141,15 @@ public final class Flasm3Lexer extends DefaultJFlexLexer { private static final int [] ZZ_ACTION = zzUnpackAction(); private static final String ZZ_ACTION_PACKED_0 = - "\3\0\2\1\1\2\1\1\1\3\2\4\1\1\1\5"+ - "\2\6\1\7\1\10\1\7\2\1\1\11\1\12\1\0"+ - "\1\13\1\14\2\3\1\0\1\10\2\0\2\11\1\3"+ - "\1\0\1\10\2\0\1\15"; + "\3\0\2\1\1\2\1\1\1\2\1\3\2\4\1\1"+ + "\1\5\2\6\1\7\1\10\1\7\2\1\1\11\1\12"+ + "\1\0\1\13\1\2\1\14\2\3\1\0\1\10\2\0"+ + "\2\11\1\2\1\3\1\0\1\10\1\0\1\2\1\0"+ + "\1\2\1\15\15\2\1\0\2\2\2\0\2\2\1\16"+ + "\2\2"; private static int [] zzUnpackAction() { - int [] result = new int[38]; + int [] result = new int[66]; int offset = 0; offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); return result; @@ -171,14 +174,18 @@ public final class Flasm3Lexer extends DefaultJFlexLexer { private static final int [] ZZ_ROWMAP = zzUnpackRowMap(); private static final String ZZ_ROWMAP_PACKED_0 = - "\0\0\0\27\0\56\0\105\0\134\0\163\0\212\0\241"+ - "\0\270\0\105\0\317\0\105\0\346\0\105\0\375\0\u0114"+ - "\0\u012b\0\u0142\0\u0159\0\u0170\0\105\0\212\0\105\0\105"+ - "\0\u0187\0\u019e\0\u01b5\0\u01cc\0\u01e3\0\u0159\0\u01fa\0\105"+ - "\0\105\0\u0211\0\u0228\0\u0228\0\u023f\0\105"; + "\0\0\0\45\0\112\0\157\0\224\0\271\0\336\0\u0103"+ + "\0\u0128\0\u014d\0\157\0\u0172\0\157\0\u0197\0\157\0\u01bc"+ + "\0\u01e1\0\u0206\0\u022b\0\u0250\0\u0275\0\157\0\336\0\157"+ + "\0\u029a\0\157\0\u02bf\0\u02e4\0\u0309\0\u032e\0\u0353\0\u0250"+ + "\0\u0378\0\157\0\u039d\0\157\0\u03c2\0\u03e7\0\u03e7\0\u040c"+ + "\0\u0431\0\u0456\0\157\0\u047b\0\u04a0\0\u04c5\0\u04ea\0\u050f"+ + "\0\u0534\0\u0559\0\u057e\0\u05a3\0\u05c8\0\u05ed\0\u0612\0\u0637"+ + "\0\u065c\0\u0681\0\u06a6\0\u06cb\0\u06f0\0\u0715\0\u073a\0\157"+ + "\0\u075f\0\u0784"; private static int [] zzUnpackRowMap() { - int [] result = new int[38]; + int [] result = new int[66]; int offset = 0; offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); return result; @@ -202,31 +209,105 @@ public final class Flasm3Lexer extends DefaultJFlexLexer { private static final String ZZ_TRANS_PACKED_0 = "\3\4\1\5\1\6\3\4\1\7\1\4\1\6\1\7"+ - "\4\4\1\7\1\6\5\4\1\10\1\11\1\12\22\10"+ - "\1\13\1\14\1\4\1\15\1\16\1\4\1\17\1\4"+ - "\1\20\1\4\1\21\1\4\2\21\1\4\1\20\1\22"+ - "\1\23\2\21\1\4\1\20\1\24\1\4\1\25\32\0"+ - "\1\5\27\0\1\6\1\0\1\6\1\0\2\26\2\6"+ - "\1\27\1\6\2\0\1\26\1\6\1\0\1\6\7\0"+ - "\1\26\1\0\1\26\1\0\4\26\1\27\1\26\2\0"+ - "\2\26\1\0\1\26\3\0\1\10\2\0\22\10\4\0"+ - "\1\12\24\0\2\30\1\0\12\30\1\31\5\30\1\32"+ - "\3\30\2\0\1\16\30\0\1\21\1\33\1\21\1\0"+ - "\4\21\1\0\1\21\2\0\2\21\1\0\1\21\11\0"+ - "\1\20\6\0\1\20\1\0\1\34\2\35\1\0\1\20"+ - "\7\0\1\21\1\0\1\21\1\0\4\21\1\0\1\21"+ - "\2\0\2\21\1\0\1\21\11\0\1\20\6\0\1\20"+ - "\1\0\1\36\3\0\1\20\11\0\1\34\6\0\1\34"+ - "\5\0\1\34\3\0\1\24\1\37\1\40\24\24\15\0"+ - "\1\32\5\0\1\32\20\0\1\41\5\0\1\41\11\0"+ - "\1\42\6\0\1\42\5\0\1\42\11\0\1\34\6\0"+ - "\1\34\2\0\2\35\1\0\1\34\11\0\1\43\6\0"+ - "\1\43\1\44\3\0\1\44\1\43\5\0\1\40\32\0"+ - "\1\42\1\45\5\0\1\42\5\0\1\42\11\0\1\43"+ - "\6\0\1\43\5\0\1\43\31\0\1\46"; + "\4\4\1\7\1\10\4\4\13\6\1\5\1\6\2\4"+ + "\1\11\1\12\1\13\22\11\1\14\15\11\1\15\1\11"+ + "\1\4\1\16\1\17\1\4\1\20\1\4\1\21\1\4"+ + "\1\22\1\4\2\22\1\4\1\21\1\23\1\24\2\22"+ + "\1\4\1\21\1\25\1\4\13\22\1\4\1\22\1\26"+ + "\1\21\50\0\1\5\35\0\1\5\7\0\1\6\1\0"+ + "\1\6\1\0\2\27\2\6\1\30\1\6\2\0\1\27"+ + "\1\6\1\0\1\6\2\0\13\6\1\0\1\6\1\0"+ + "\1\6\4\0\1\27\1\0\1\27\1\0\4\27\1\30"+ + "\1\27\2\0\2\27\1\0\1\27\2\0\13\27\1\0"+ + "\1\27\1\0\1\27\4\0\1\6\1\0\1\6\1\0"+ + "\2\27\2\6\1\30\1\6\2\0\1\27\1\6\1\0"+ + "\1\6\2\0\1\31\12\6\1\0\1\6\1\0\1\6"+ + "\1\11\2\0\22\11\1\0\15\11\1\0\1\11\2\0"+ + "\1\13\42\0\2\32\1\0\12\32\1\33\5\32\1\34"+ + "\20\32\1\33\2\0\1\17\46\0\1\22\1\35\1\22"+ + "\1\0\4\22\1\0\1\22\2\0\2\22\1\0\1\22"+ + "\2\0\13\22\1\0\1\22\1\0\1\22\6\0\1\21"+ + "\6\0\1\21\1\0\1\36\2\37\1\0\1\21\20\0"+ + "\1\21\4\0\1\22\1\0\1\22\1\0\4\22\1\0"+ + "\1\22\2\0\2\22\1\0\1\22\2\0\13\22\1\0"+ + "\1\22\1\0\1\22\6\0\1\21\6\0\1\21\1\0"+ + "\1\40\3\0\1\21\20\0\1\21\6\0\1\36\6\0"+ + "\1\36\5\0\1\36\20\0\1\36\1\25\1\41\1\42"+ + "\42\25\4\0\1\6\1\0\1\6\1\0\2\27\2\6"+ + "\1\30\1\6\2\0\1\27\1\6\1\0\1\6\2\0"+ + "\1\6\1\43\11\6\1\0\1\6\1\0\1\6\15\0"+ + "\1\34\5\0\1\34\20\0\1\34\15\0\1\44\5\0"+ + "\1\44\20\0\1\44\6\0\1\45\6\0\1\45\5\0"+ + "\1\45\20\0\1\45\6\0\1\36\6\0\1\36\2\0"+ + "\2\37\1\0\1\36\20\0\1\36\6\0\1\46\6\0"+ + "\1\46\1\47\3\0\1\47\1\46\20\0\1\46\2\0"+ + "\1\42\46\0\1\6\1\0\1\6\1\0\2\27\2\6"+ + "\1\30\1\6\2\0\1\27\1\50\1\0\1\6\2\0"+ + "\13\6\1\0\1\6\1\0\1\6\6\0\1\45\1\51"+ + "\5\0\1\45\5\0\1\45\20\0\1\45\6\0\1\46"+ + "\6\0\1\46\5\0\1\46\20\0\1\46\4\0\1\6"+ + "\1\0\1\6\1\0\2\27\2\6\1\30\1\6\2\0"+ + "\1\27\1\6\1\0\1\6\2\0\2\6\1\52\10\6"+ + "\1\0\1\6\1\0\1\6\43\0\1\53\5\0\1\6"+ + "\1\0\1\6\1\0\2\27\2\6\1\30\1\6\2\0"+ + "\1\27\1\6\1\0\1\6\2\0\3\6\1\54\7\6"+ + "\1\0\1\6\1\0\1\6\4\0\1\6\1\0\1\6"+ + "\1\0\2\27\2\6\1\30\1\6\2\0\1\27\1\6"+ + "\1\0\1\6\2\0\4\6\1\55\6\6\1\0\1\6"+ + "\1\0\1\6\4\0\1\6\1\0\1\6\1\0\2\27"+ + "\2\6\1\30\1\6\2\0\1\27\1\6\1\0\1\6"+ + "\2\0\5\6\1\56\5\6\1\0\1\6\1\0\1\6"+ + "\4\0\1\6\1\0\1\6\1\0\2\27\2\6\1\30"+ + "\1\6\2\0\1\27\1\6\1\0\1\6\2\0\6\6"+ + "\1\57\4\6\1\0\1\6\1\0\1\6\4\0\1\6"+ + "\1\0\1\6\1\0\2\27\2\6\1\30\1\6\2\0"+ + "\1\27\1\60\1\0\1\6\2\0\3\6\1\61\3\6"+ + "\1\62\3\6\1\0\1\6\1\0\1\6\4\0\1\6"+ + "\1\0\1\6\1\0\2\27\2\6\1\30\1\6\2\0"+ + "\1\27\1\6\1\0\1\6\2\0\6\6\1\63\4\6"+ + "\1\0\1\6\1\0\1\6\4\0\1\6\1\0\1\6"+ + "\1\0\2\27\2\6\1\30\1\6\2\0\1\27\1\6"+ + "\1\0\1\6\2\0\10\6\1\64\2\6\1\0\1\6"+ + "\1\0\1\6\4\0\1\6\1\0\1\6\1\0\2\27"+ + "\2\6\1\30\1\6\2\0\1\27\1\6\1\0\1\6"+ + "\2\0\3\6\1\65\7\6\1\0\1\6\1\0\1\6"+ + "\4\0\1\6\1\0\1\6\1\0\2\27\2\6\1\30"+ + "\1\6\2\0\1\27\1\6\1\0\1\6\2\0\12\6"+ + "\1\66\1\0\1\6\1\0\1\6\4\0\1\6\1\0"+ + "\1\6\1\0\2\27\2\6\1\30\1\6\2\0\1\27"+ + "\1\6\1\0\1\6\2\0\11\6\1\67\1\6\1\0"+ + "\1\6\1\0\1\6\4\0\1\6\1\0\1\6\1\0"+ + "\2\27\2\6\1\30\1\6\2\0\1\27\1\6\1\0"+ + "\1\6\2\0\10\6\1\70\2\6\1\0\1\6\1\0"+ + "\1\6\4\0\1\6\1\0\1\6\1\0\2\27\2\6"+ + "\1\30\1\6\2\0\1\27\1\6\1\0\1\6\2\0"+ + "\13\6\1\71\1\6\1\0\1\6\4\0\1\6\1\0"+ + "\1\6\1\0\2\27\2\6\1\30\1\6\2\0\1\27"+ + "\1\6\1\0\1\6\2\0\13\6\1\0\1\72\1\0"+ + "\1\6\4\0\1\6\1\0\1\6\1\0\2\27\2\6"+ + "\1\30\1\6\2\0\1\27\1\6\1\0\1\6\2\0"+ + "\11\6\1\73\1\6\1\0\1\6\1\0\1\6\6\0"+ + "\1\74\6\0\1\75\5\0\1\74\20\0\1\74\4\0"+ + "\1\6\1\0\1\6\1\0\2\27\2\6\1\30\1\6"+ + "\2\0\1\27\1\76\1\0\1\6\2\0\13\6\1\0"+ + "\1\6\1\0\1\6\4\0\1\6\1\0\1\6\1\0"+ + "\2\27\2\6\1\30\1\6\2\0\1\27\1\6\1\0"+ + "\1\6\2\0\3\6\1\77\7\6\1\0\1\6\1\0"+ + "\1\6\6\0\1\74\5\0\1\100\1\74\5\0\1\74"+ + "\20\0\1\74\14\0\1\100\34\0\1\6\1\0\1\6"+ + "\1\0\2\27\2\6\1\30\1\6\2\0\1\27\1\6"+ + "\1\0\1\6\2\0\3\6\1\66\7\6\1\0\1\6"+ + "\1\0\1\6\4\0\1\6\1\0\1\101\1\0\2\27"+ + "\2\6\1\30\1\102\2\0\1\27\1\6\1\0\1\101"+ + "\2\0\13\6\1\0\1\6\1\0\1\101\4\0\1\6"+ + "\1\0\1\101\1\0\2\27\2\6\1\100\1\101\2\0"+ + "\1\27\1\6\1\0\1\101\2\0\13\6\1\0\1\6"+ + "\1\0\1\101\4\0\1\6\1\0\1\6\1\0\2\27"+ + "\2\6\1\100\1\6\2\0\1\27\1\6\1\0\1\6"+ + "\2\0\13\6\1\0\1\6\1\0\1\6"; private static int [] zzUnpackTrans() { - int [] result = new int[598]; + int [] result = new int[1961]; int offset = 0; offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); return result; @@ -264,12 +345,14 @@ public final class Flasm3Lexer extends DefaultJFlexLexer { private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); private static final String ZZ_ATTRIBUTE_PACKED_0 = - "\3\0\1\11\5\1\1\11\1\1\1\11\1\1\1\11"+ - "\6\1\1\11\1\0\2\11\2\1\1\0\1\1\2\0"+ - "\1\1\2\11\1\0\1\1\2\0\1\11"; + "\3\0\1\11\6\1\1\11\1\1\1\11\1\1\1\11"+ + "\6\1\1\11\1\0\1\11\1\1\1\11\2\1\1\0"+ + "\1\1\2\0\1\1\1\11\1\1\1\11\1\0\1\1"+ + "\1\0\1\1\1\0\1\1\1\11\15\1\1\0\2\1"+ + "\2\0\2\1\1\11\2\1"; private static int [] zzUnpackAttribute() { - int [] result = new int[38]; + int [] result = new int[66]; int offset = 0; offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); return result; @@ -387,7 +470,7 @@ public final class Flasm3Lexer extends DefaultJFlexLexer { char [] map = new char[0x10000]; int i = 0; /* index in packed string */ int j = 0; /* index in unpacked array */ - while (i < 1702) { + while (i < 1734) { int count = packed.charAt(i++); char value = packed.charAt(i++); do map[j++] = value; while (--count > 0); @@ -665,63 +748,67 @@ public final class Flasm3Lexer extends DefaultJFlexLexer { return token(TokenType.STRING, tokenStart, tokenLength + 1); } } - case 14: break; + case 15: break; case 9: { yybegin(YYINITIAL); return token(TokenType.COMMENT); } - case 15: break; + case 16: break; case 4: { yybegin(YYINITIAL); return token(TokenType.ERROR,tokenStart, tokenLength); } - case 16: break; + case 17: break; + case 14: + { return token(TokenType.KEYWORD); + } + case 18: break; case 11: { return token(TokenType.IDENTIFIER,yychar,yylength()-1); } - case 17: break; + case 19: break; case 10: { yybegin(STRING); tokenStart = yychar; tokenLength = 1; isMultiname=false; } - case 18: break; + case 20: break; case 13: { isMultiname=true; yybegin(STRING); tokenStart = yychar; tokenLength = yylength(); } - case 19: break; + case 21: break; case 12: { tokenLength += 2; } - case 20: break; + case 22: break; case 7: { return token(TokenType.IDENTIFIER); } - case 21: break; + case 23: break; case 2: { yybegin(PARAMETERS); return token(TokenType.KEYWORD); } - case 22: break; + case 24: break; case 8: { return token(TokenType.NUMBER); } - case 23: break; + case 25: break; case 6: { yybegin(YYINITIAL); } - case 24: break; + case 26: break; case 1: { } - case 25: break; + case 27: break; case 3: { tokenLength += yylength(); } - case 26: break; + case 28: break; default: if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { zzAtEOF = true; diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/FlasmLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/FlasmLexer.java index 794a7559a..55669d0ed 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/FlasmLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/FlasmLexer.java @@ -1,838 +1,800 @@ -/* The following code was generated by JFlex 1.4.3 on 18.8.10 12:21 */ - -/* Flash assembler language lexer specification */ - -package jsyntaxpane.lexers; - - -import jsyntaxpane.Token; -import jsyntaxpane.TokenType; +/* The following code was generated by JFlex 1.4.3 on 10.3.13 15:54 */ +/* Flash assembler language lexer specification */ + +package jsyntaxpane.lexers; + + +import jsyntaxpane.Token; +import jsyntaxpane.TokenType; + /** - * This class is a scanner generated by + * This class is a scanner generated by * JFlex 1.4.3 - * on 18.8.10 12:21 from the specification file - * D:/Dokumenty/Programovani/JavaSE/ASDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/flasm.flex + * on 10.3.13 15:54 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/flasm.flex */ public final class FlasmLexer extends DefaultJFlexLexer { - /** - * This character denotes the end of file - */ - public static final int YYEOF = -1; + /** This character denotes the end of file */ + public static final int YYEOF = -1; - /** - * initial size of the lookahead buffer - */ - private static final int ZZ_BUFFERSIZE = 16384; + /** initial size of the lookahead buffer */ + private static final int ZZ_BUFFERSIZE = 16384; - /** - * lexical states - */ - public static final int STRING = 2; - public static final int YYINITIAL = 0; - public static final int PARAMETERS = 4; + /** lexical states */ + public static final int STRING = 2; + public static final int YYINITIAL = 0; + public static final int PARAMETERS = 4; - /** - * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l - * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l - * at the beginning of a line - * l is of the form l = 2*k, k a non negative integer - */ - private static final int ZZ_LEXSTATE[] = { - 0, 0, 1, 1, 2, 2 - }; + /** + * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l + * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l + * at the beginning of a line + * l is of the form l = 2*k, k a non negative integer + */ + private static final int ZZ_LEXSTATE[] = { + 0, 0, 1, 1, 2, 2 + }; - /** - * Translates characters to character classes - */ - private static final String ZZ_CMAP_PACKED = - "\11\6\1\4\1\2\1\0\1\4\1\1\16\6\4\0\1\4\1\0" + - "\1\40\1\0\1\5\6\0\1\32\1\0\1\27\1\30\1\0\1\26" + - "\3\41\4\33\2\11\1\12\1\3\5\0\4\7\1\31\25\7\1\0" + - "\1\34\2\0\1\10\1\0\1\20\1\7\1\36\1\24\1\16\1\17" + - "\1\35\1\7\1\25\2\7\1\21\1\7\1\23\1\37\2\7\1\14" + - "\1\22\1\13\1\15\5\7\1\0\1\0\1\0\1\0\41\6\2\0" + - "\4\5\4\0\1\5\2\0\1\6\7\0\1\5\4\0\1\5\5\0" + - "\27\5\1\0\37\5\1\0\u013f\5\31\0\162\5\4\0\14\5\16\0" + - "\5\5\11\0\1\5\21\0\130\6\5\0\23\6\12\0\1\5\13\0" + - "\1\5\1\0\3\5\1\0\1\5\1\0\24\5\1\0\54\5\1\0" + - "\46\5\1\0\5\5\4\0\202\5\1\0\4\6\3\0\105\5\1\0" + - "\46\5\2\0\2\5\6\0\20\5\41\0\46\5\2\0\1\5\7\0" + - "\47\5\11\0\21\6\1\0\27\6\1\0\3\6\1\0\1\6\1\0" + - "\2\6\1\0\1\6\13\0\33\5\5\0\3\5\15\0\4\6\14\0" + - "\6\6\13\0\32\5\5\0\13\5\16\6\7\0\12\6\4\0\2\5" + - "\1\6\143\5\1\0\1\5\10\6\1\0\6\6\2\5\2\6\1\0" + - "\4\6\2\5\12\6\3\5\2\0\1\5\17\0\1\6\1\5\1\6" + - "\36\5\33\6\2\0\3\5\60\0\46\5\13\6\1\5\u014f\0\3\6" + - "\66\5\2\0\1\6\1\5\20\6\2\0\1\5\4\6\3\0\12\5" + - "\2\6\2\0\12\6\21\0\3\6\1\0\10\5\2\0\2\5\2\0" + - "\26\5\1\0\7\5\1\0\1\5\3\0\4\5\2\0\1\6\1\5" + - "\7\6\2\0\2\6\2\0\3\6\11\0\1\6\4\0\2\5\1\0" + - "\3\5\2\6\2\0\12\6\4\5\15\0\3\6\1\0\6\5\4\0" + - "\2\5\2\0\26\5\1\0\7\5\1\0\2\5\1\0\2\5\1\0" + - "\2\5\2\0\1\6\1\0\5\6\4\0\2\6\2\0\3\6\13\0" + - "\4\5\1\0\1\5\7\0\14\6\3\5\14\0\3\6\1\0\11\5" + - "\1\0\3\5\1\0\26\5\1\0\7\5\1\0\2\5\1\0\5\5" + - "\2\0\1\6\1\5\10\6\1\0\3\6\1\0\3\6\2\0\1\5" + - "\17\0\2\5\2\6\2\0\12\6\1\0\1\5\17\0\3\6\1\0" + - "\10\5\2\0\2\5\2\0\26\5\1\0\7\5\1\0\2\5\1\0" + - "\5\5\2\0\1\6\1\5\6\6\3\0\2\6\2\0\3\6\10\0" + - "\2\6\4\0\2\5\1\0\3\5\4\0\12\6\1\0\1\5\20\0" + - "\1\6\1\5\1\0\6\5\3\0\3\5\1\0\4\5\3\0\2\5" + - "\1\0\1\5\1\0\2\5\3\0\2\5\3\0\3\5\3\0\10\5" + - "\1\0\3\5\4\0\5\6\3\0\3\6\1\0\4\6\11\0\1\6" + - "\17\0\11\6\11\0\1\5\7\0\3\6\1\0\10\5\1\0\3\5" + - "\1\0\27\5\1\0\12\5\1\0\5\5\4\0\7\6\1\0\3\6" + - "\1\0\4\6\7\0\2\6\11\0\2\5\4\0\12\6\22\0\2\6" + - "\1\0\10\5\1\0\3\5\1\0\27\5\1\0\12\5\1\0\5\5" + - "\2\0\1\6\1\5\7\6\1\0\3\6\1\0\4\6\7\0\2\6" + - "\7\0\1\5\1\0\2\5\4\0\12\6\22\0\2\6\1\0\10\5" + - "\1\0\3\5\1\0\27\5\1\0\20\5\4\0\6\6\2\0\3\6" + - "\1\0\4\6\11\0\1\6\10\0\2\5\4\0\12\6\22\0\2\6" + - "\1\0\22\5\3\0\30\5\1\0\11\5\1\0\1\5\2\0\7\5" + - "\3\0\1\6\4\0\6\6\1\0\1\6\1\0\10\6\22\0\2\6" + - "\15\0\60\5\1\6\2\5\7\6\4\0\10\5\10\6\1\0\12\6" + - "\47\0\2\5\1\0\1\5\2\0\2\5\1\0\1\5\2\0\1\5" + - "\6\0\4\5\1\0\7\5\1\0\3\5\1\0\1\5\1\0\1\5" + - "\2\0\2\5\1\0\4\5\1\6\2\5\6\6\1\0\2\6\1\5" + - "\2\0\5\5\1\0\1\5\1\0\6\6\2\0\12\6\2\0\2\5" + - "\42\0\1\5\27\0\2\6\6\0\12\6\13\0\1\6\1\0\1\6" + - "\1\0\1\6\4\0\2\6\10\5\1\0\42\5\6\0\24\6\1\0" + - "\2\6\4\5\4\0\10\6\1\0\44\6\11\0\1\6\71\0\42\5" + - "\1\0\5\5\1\0\2\5\1\0\7\6\3\0\4\6\6\0\12\6" + - "\6\0\6\5\4\6\106\0\46\5\12\0\51\5\7\0\132\5\5\0" + - "\104\5\5\0\122\5\6\0\7\5\1\0\77\5\1\0\1\5\1\0" + - "\4\5\2\0\7\5\1\0\1\5\1\0\4\5\2\0\47\5\1\0" + - "\1\5\1\0\4\5\2\0\37\5\1\0\1\5\1\0\4\5\2\0" + - "\7\5\1\0\1\5\1\0\4\5\2\0\7\5\1\0\7\5\1\0" + - "\27\5\1\0\37\5\1\0\1\5\1\0\4\5\2\0\7\5\1\0" + - "\47\5\1\0\23\5\16\0\11\6\56\0\125\5\14\0\u026c\5\2\0" + - "\10\5\12\0\32\5\5\0\113\5\3\0\3\5\17\0\15\5\1\0" + - "\4\5\3\6\13\0\22\5\3\6\13\0\22\5\2\6\14\0\15\5" + - "\1\0\3\5\1\0\2\6\14\0\64\5\40\6\3\0\1\5\3\0" + - "\2\5\1\6\2\0\12\6\41\0\3\6\2\0\12\6\6\0\130\5" + - "\10\0\51\5\1\6\126\0\35\5\3\0\14\6\4\0\14\6\12\0" + - "\12\6\36\5\2\0\5\5\u038b\0\154\5\224\0\234\5\4\0\132\5" + - "\6\0\26\5\2\0\6\5\2\0\46\5\2\0\6\5\2\0\10\5" + - "\1\0\1\5\1\0\1\5\1\0\1\5\1\0\37\5\2\0\65\5" + - "\1\0\7\5\1\0\1\5\3\0\3\5\1\0\7\5\3\0\4\5" + - "\2\0\6\5\4\0\15\5\5\0\3\5\1\0\7\5\17\0\4\6" + - "\32\0\5\6\20\0\2\5\23\0\1\5\13\0\4\6\6\0\6\6" + - "\1\0\1\5\15\0\1\5\40\0\22\5\36\0\15\6\4\0\1\6" + - "\3\0\6\6\27\0\1\5\4\0\1\5\2\0\12\5\1\0\1\5" + - "\3\0\5\5\6\0\1\5\1\0\1\5\1\0\1\5\1\0\4\5" + - "\1\0\3\5\1\0\7\5\3\0\3\5\5\0\5\5\26\0\44\5" + - "\u0e81\0\3\5\31\0\11\5\6\6\1\0\5\5\2\0\5\5\4\0" + - "\126\5\2\0\2\6\2\0\3\5\1\0\137\5\5\0\50\5\4\0" + - "\136\5\21\0\30\5\70\0\20\5\u0200\0\u19b6\5\112\0\u51a6\5\132\0" + - "\u048d\5\u0773\0\u2ba4\5\u215c\0\u012e\5\2\0\73\5\225\0\7\5\14\0" + - "\5\5\5\0\1\5\1\6\12\5\1\0\15\5\1\0\5\5\1\0" + - "\1\5\1\0\2\5\1\0\2\5\1\0\154\5\41\0\u016b\5\22\0" + - "\100\5\2\0\66\5\50\0\15\5\3\0\20\6\20\0\4\6\17\0" + - "\2\5\30\0\3\5\31\0\1\5\6\0\5\5\1\0\207\5\2\0" + - "\1\6\4\0\1\5\13\0\12\6\7\0\32\5\4\0\1\5\1\0" + - "\32\5\12\0\132\5\3\0\6\5\2\0\6\5\2\0\6\5\2\0" + - "\3\5\3\0\2\5\3\0\2\5\22\0\3\6\4\0"; + /** + * Translates characters to character classes + */ + private static final String ZZ_CMAP_PACKED = + "\11\6\1\4\1\2\1\0\1\4\1\1\16\6\4\0\1\4\1\0"+ + "\1\40\1\0\1\5\6\0\1\32\1\0\1\27\1\30\1\0\1\26"+ + "\3\41\4\33\2\11\1\12\1\3\5\0\4\7\1\31\25\7\1\0"+ + "\1\34\2\0\1\10\1\0\1\20\1\7\1\36\1\24\1\16\1\17"+ + "\1\35\1\7\1\25\2\7\1\21\1\7\1\23\1\37\2\7\1\14"+ + "\1\22\1\13\1\15\5\7\1\0\1\0\1\0\1\0\41\6\2\0"+ + "\4\5\4\0\1\5\2\0\1\6\7\0\1\5\4\0\1\5\5\0"+ + "\27\5\1\0\37\5\1\0\u013f\5\31\0\162\5\4\0\14\5\16\0"+ + "\5\5\11\0\1\5\21\0\130\6\5\0\23\6\12\0\1\5\13\0"+ + "\1\5\1\0\3\5\1\0\1\5\1\0\24\5\1\0\54\5\1\0"+ + "\46\5\1\0\5\5\4\0\202\5\1\0\4\6\3\0\105\5\1\0"+ + "\46\5\2\0\2\5\6\0\20\5\41\0\46\5\2\0\1\5\7\0"+ + "\47\5\11\0\21\6\1\0\27\6\1\0\3\6\1\0\1\6\1\0"+ + "\2\6\1\0\1\6\13\0\33\5\5\0\3\5\15\0\4\6\14\0"+ + "\6\6\13\0\32\5\5\0\13\5\16\6\7\0\12\6\4\0\2\5"+ + "\1\6\143\5\1\0\1\5\10\6\1\0\6\6\2\5\2\6\1\0"+ + "\4\6\2\5\12\6\3\5\2\0\1\5\17\0\1\6\1\5\1\6"+ + "\36\5\33\6\2\0\3\5\60\0\46\5\13\6\1\5\u014f\0\3\6"+ + "\66\5\2\0\1\6\1\5\20\6\2\0\1\5\4\6\3\0\12\5"+ + "\2\6\2\0\12\6\21\0\3\6\1\0\10\5\2\0\2\5\2\0"+ + "\26\5\1\0\7\5\1\0\1\5\3\0\4\5\2\0\1\6\1\5"+ + "\7\6\2\0\2\6\2\0\3\6\11\0\1\6\4\0\2\5\1\0"+ + "\3\5\2\6\2\0\12\6\4\5\15\0\3\6\1\0\6\5\4\0"+ + "\2\5\2\0\26\5\1\0\7\5\1\0\2\5\1\0\2\5\1\0"+ + "\2\5\2\0\1\6\1\0\5\6\4\0\2\6\2\0\3\6\13\0"+ + "\4\5\1\0\1\5\7\0\14\6\3\5\14\0\3\6\1\0\11\5"+ + "\1\0\3\5\1\0\26\5\1\0\7\5\1\0\2\5\1\0\5\5"+ + "\2\0\1\6\1\5\10\6\1\0\3\6\1\0\3\6\2\0\1\5"+ + "\17\0\2\5\2\6\2\0\12\6\1\0\1\5\17\0\3\6\1\0"+ + "\10\5\2\0\2\5\2\0\26\5\1\0\7\5\1\0\2\5\1\0"+ + "\5\5\2\0\1\6\1\5\6\6\3\0\2\6\2\0\3\6\10\0"+ + "\2\6\4\0\2\5\1\0\3\5\4\0\12\6\1\0\1\5\20\0"+ + "\1\6\1\5\1\0\6\5\3\0\3\5\1\0\4\5\3\0\2\5"+ + "\1\0\1\5\1\0\2\5\3\0\2\5\3\0\3\5\3\0\10\5"+ + "\1\0\3\5\4\0\5\6\3\0\3\6\1\0\4\6\11\0\1\6"+ + "\17\0\11\6\11\0\1\5\7\0\3\6\1\0\10\5\1\0\3\5"+ + "\1\0\27\5\1\0\12\5\1\0\5\5\4\0\7\6\1\0\3\6"+ + "\1\0\4\6\7\0\2\6\11\0\2\5\4\0\12\6\22\0\2\6"+ + "\1\0\10\5\1\0\3\5\1\0\27\5\1\0\12\5\1\0\5\5"+ + "\2\0\1\6\1\5\7\6\1\0\3\6\1\0\4\6\7\0\2\6"+ + "\7\0\1\5\1\0\2\5\4\0\12\6\22\0\2\6\1\0\10\5"+ + "\1\0\3\5\1\0\27\5\1\0\20\5\4\0\6\6\2\0\3\6"+ + "\1\0\4\6\11\0\1\6\10\0\2\5\4\0\12\6\22\0\2\6"+ + "\1\0\22\5\3\0\30\5\1\0\11\5\1\0\1\5\2\0\7\5"+ + "\3\0\1\6\4\0\6\6\1\0\1\6\1\0\10\6\22\0\2\6"+ + "\15\0\60\5\1\6\2\5\7\6\4\0\10\5\10\6\1\0\12\6"+ + "\47\0\2\5\1\0\1\5\2\0\2\5\1\0\1\5\2\0\1\5"+ + "\6\0\4\5\1\0\7\5\1\0\3\5\1\0\1\5\1\0\1\5"+ + "\2\0\2\5\1\0\4\5\1\6\2\5\6\6\1\0\2\6\1\5"+ + "\2\0\5\5\1\0\1\5\1\0\6\6\2\0\12\6\2\0\2\5"+ + "\42\0\1\5\27\0\2\6\6\0\12\6\13\0\1\6\1\0\1\6"+ + "\1\0\1\6\4\0\2\6\10\5\1\0\42\5\6\0\24\6\1\0"+ + "\2\6\4\5\4\0\10\6\1\0\44\6\11\0\1\6\71\0\42\5"+ + "\1\0\5\5\1\0\2\5\1\0\7\6\3\0\4\6\6\0\12\6"+ + "\6\0\6\5\4\6\106\0\46\5\12\0\51\5\7\0\132\5\5\0"+ + "\104\5\5\0\122\5\6\0\7\5\1\0\77\5\1\0\1\5\1\0"+ + "\4\5\2\0\7\5\1\0\1\5\1\0\4\5\2\0\47\5\1\0"+ + "\1\5\1\0\4\5\2\0\37\5\1\0\1\5\1\0\4\5\2\0"+ + "\7\5\1\0\1\5\1\0\4\5\2\0\7\5\1\0\7\5\1\0"+ + "\27\5\1\0\37\5\1\0\1\5\1\0\4\5\2\0\7\5\1\0"+ + "\47\5\1\0\23\5\16\0\11\6\56\0\125\5\14\0\u026c\5\2\0"+ + "\10\5\12\0\32\5\5\0\113\5\3\0\3\5\17\0\15\5\1\0"+ + "\4\5\3\6\13\0\22\5\3\6\13\0\22\5\2\6\14\0\15\5"+ + "\1\0\3\5\1\0\2\6\14\0\64\5\40\6\3\0\1\5\3\0"+ + "\2\5\1\6\2\0\12\6\41\0\3\6\2\0\12\6\6\0\130\5"+ + "\10\0\51\5\1\6\126\0\35\5\3\0\14\6\4\0\14\6\12\0"+ + "\12\6\36\5\2\0\5\5\u038b\0\154\5\224\0\234\5\4\0\132\5"+ + "\6\0\26\5\2\0\6\5\2\0\46\5\2\0\6\5\2\0\10\5"+ + "\1\0\1\5\1\0\1\5\1\0\1\5\1\0\37\5\2\0\65\5"+ + "\1\0\7\5\1\0\1\5\3\0\3\5\1\0\7\5\3\0\4\5"+ + "\2\0\6\5\4\0\15\5\5\0\3\5\1\0\7\5\17\0\4\6"+ + "\32\0\5\6\20\0\2\5\23\0\1\5\13\0\4\6\6\0\6\6"+ + "\1\0\1\5\15\0\1\5\40\0\22\5\36\0\15\6\4\0\1\6"+ + "\3\0\6\6\27\0\1\5\4\0\1\5\2\0\12\5\1\0\1\5"+ + "\3\0\5\5\6\0\1\5\1\0\1\5\1\0\1\5\1\0\4\5"+ + "\1\0\3\5\1\0\7\5\3\0\3\5\5\0\5\5\26\0\44\5"+ + "\u0e81\0\3\5\31\0\11\5\6\6\1\0\5\5\2\0\5\5\4\0"+ + "\126\5\2\0\2\6\2\0\3\5\1\0\137\5\5\0\50\5\4\0"+ + "\136\5\21\0\30\5\70\0\20\5\u0200\0\u19b6\5\112\0\u51a6\5\132\0"+ + "\u048d\5\u0773\0\u2ba4\5\u215c\0\u012e\5\2\0\73\5\225\0\7\5\14\0"+ + "\5\5\5\0\1\5\1\6\12\5\1\0\15\5\1\0\5\5\1\0"+ + "\1\5\1\0\2\5\1\0\2\5\1\0\154\5\41\0\u016b\5\22\0"+ + "\100\5\2\0\66\5\50\0\15\5\3\0\20\6\20\0\4\6\17\0"+ + "\2\5\30\0\3\5\31\0\1\5\6\0\5\5\1\0\207\5\2\0"+ + "\1\6\4\0\1\5\13\0\12\6\7\0\32\5\4\0\1\5\1\0"+ + "\32\5\12\0\132\5\3\0\6\5\2\0\6\5\2\0\6\5\2\0"+ + "\3\5\3\0\2\5\3\0\2\5\22\0\3\6\4\0"; - /** - * Translates characters to character classes - */ - private static final char[] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED); + /** + * Translates characters to character classes + */ + private static final char [] ZZ_CMAP = zzUnpackCMap(ZZ_CMAP_PACKED); - /** - * Translates DFA states to action switch labels. - */ - private static final int[] ZZ_ACTION = zzUnpackAction(); + /** + * Translates DFA states to action switch labels. + */ + private static final int [] ZZ_ACTION = zzUnpackAction(); - private static final String ZZ_ACTION_PACKED_0 = - "\3\0\3\1\1\2\1\3\2\4\1\1\1\5\2\6" + - "\1\7\1\10\1\11\5\10\2\1\1\10\1\12\1\0" + - "\1\13\1\14\2\3\1\0\1\11\5\10\1\0\1\10" + - "\1\3\1\11\1\0\6\10\1\15\16\10\2\16\1\0" + - "\1\16"; + private static final String ZZ_ACTION_PACKED_0 = + "\3\0\1\1\1\2\2\1\1\3\1\4\2\5\1\1"+ + "\1\6\2\7\1\10\1\11\5\10\2\1\1\10\1\12"+ + "\1\0\1\13\1\14\2\4\1\0\1\11\5\10\1\0"+ + "\1\10\1\4\1\11\1\0\6\10\1\15\16\10\2\16"+ + "\1\0\1\16"; - private static int[] zzUnpackAction() { - int[] result = new int[68]; - int offset = 0; - offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); - return result; + private static int [] zzUnpackAction() { + int [] result = new int[68]; + int offset = 0; + offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); + return result; + } + + private static int zzUnpackAction(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int count = packed.charAt(i++); + int value = packed.charAt(i++); + do result[j++] = value; while (--count > 0); + } + return j; + } + + + /** + * Translates a state to a row index in the transition table + */ + private static final int [] ZZ_ROWMAP = zzUnpackRowMap(); + + private static final String ZZ_ROWMAP_PACKED_0 = + "\0\0\0\42\0\104\0\146\0\210\0\252\0\314\0\356"+ + "\0\u0110\0\u0132\0\146\0\u0154\0\146\0\u0176\0\146\0\u0198"+ + "\0\u01ba\0\u01dc\0\u01fe\0\u0220\0\u0242\0\u0264\0\u0286\0\u02a8"+ + "\0\u02ca\0\146\0\314\0\146\0\146\0\u02ec\0\u030e\0\u0330"+ + "\0\u0352\0\u0374\0\u0396\0\u03b8\0\u03da\0\u03fc\0\u02a8\0\u041e"+ + "\0\146\0\u0440\0\u0440\0\u0462\0\u0484\0\u04a6\0\u04c8\0\u04ea"+ + "\0\u050c\0\u0198\0\u052e\0\u0550\0\u0572\0\u0594\0\u05b6\0\u05d8"+ + "\0\u05fa\0\u061c\0\u063e\0\u0660\0\u0682\0\u06a4\0\u06c6\0\u06e8"+ + "\0\u070a\0\u0198\0\u072c\0\u074e"; + + private static int [] zzUnpackRowMap() { + int [] result = new int[68]; + int offset = 0; + offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); + return result; + } + + private static int zzUnpackRowMap(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int high = packed.charAt(i++) << 16; + result[j++] = high | packed.charAt(i++); + } + return j; + } + + /** + * The transition table of the DFA + */ + private static final int [] ZZ_TRANS = zzUnpackTrans(); + + private static final String ZZ_TRANS_PACKED_0 = + "\3\4\1\5\1\6\1\7\1\4\1\10\1\7\2\4"+ + "\13\10\3\4\1\10\3\4\3\10\2\4\1\11\1\12"+ + "\1\13\31\11\1\14\3\11\1\15\1\11\1\4\1\16"+ + "\1\17\1\5\1\4\1\20\1\4\2\20\1\21\1\4"+ + "\1\22\1\23\1\24\1\20\1\25\3\20\1\26\2\20"+ + "\1\21\1\27\1\30\1\20\1\4\1\21\1\4\1\20"+ + "\1\31\1\20\1\32\1\21\42\0\1\5\2\0\37\5"+ + "\4\0\1\6\42\0\5\33\1\34\14\33\2\0\1\33"+ + "\1\0\1\33\1\0\3\33\1\0\1\33\5\0\2\33"+ + "\3\10\1\34\14\10\2\0\1\10\1\0\1\10\1\0"+ + "\3\10\1\0\1\10\1\11\2\0\31\11\1\0\3\11"+ + "\1\0\1\11\2\0\1\13\37\0\2\35\1\0\23\35"+ + "\1\36\4\35\1\37\5\35\1\36\2\0\1\17\44\0"+ + "\5\20\1\0\14\20\2\0\1\20\1\0\1\20\1\0"+ + "\3\20\1\0\1\20\11\0\1\21\4\0\1\40\7\0"+ + "\1\21\1\0\1\41\1\40\1\0\1\21\5\0\1\21"+ + "\5\0\5\20\1\0\1\20\1\42\12\20\2\0\1\20"+ + "\1\0\1\20\1\0\3\20\1\0\1\20\5\0\5\20"+ + "\1\0\3\20\1\43\10\20\2\0\1\20\1\0\1\20"+ + "\1\0\3\20\1\0\1\20\5\0\5\20\1\0\10\20"+ + "\1\44\3\20\2\0\1\20\1\0\1\20\1\0\3\20"+ + "\1\0\1\20\5\0\5\20\1\0\5\20\1\45\6\20"+ + "\2\0\1\20\1\0\1\20\1\0\3\20\1\0\1\20"+ + "\5\0\5\20\1\0\2\20\1\46\11\20\2\0\1\20"+ + "\1\0\1\20\1\0\3\20\1\0\1\20\11\0\1\21"+ + "\14\0\1\21\1\0\1\47\2\0\1\21\5\0\1\21"+ + "\11\0\1\41\14\0\1\41\4\0\1\41\5\0\1\41"+ + "\5\0\5\20\1\0\14\20\2\0\1\20\1\0\1\20"+ + "\1\0\2\20\1\50\1\0\1\20\26\0\1\37\4\0"+ + "\1\37\5\0\1\37\26\0\1\51\4\0\1\51\5\0"+ + "\1\51\11\0\1\52\14\0\1\52\1\53\2\0\1\53"+ + "\1\52\5\0\1\52\11\0\1\41\4\0\1\40\7\0"+ + "\1\41\2\0\1\40\1\0\1\41\5\0\1\41\5\0"+ + "\5\20\1\0\2\20\1\54\11\20\2\0\1\20\1\0"+ + "\1\20\1\0\3\20\1\0\1\20\5\0\5\20\1\0"+ + "\14\20\2\0\1\20\1\0\1\20\1\0\1\55\2\20"+ + "\1\0\1\20\5\0\5\20\1\0\11\20\1\56\2\20"+ + "\2\0\1\20\1\0\1\20\1\0\3\20\1\0\1\20"+ + "\5\0\5\20\1\0\6\20\1\57\5\20\2\0\1\20"+ + "\1\0\1\20\1\0\3\20\1\0\1\20\5\0\5\20"+ + "\1\0\6\20\1\60\5\20\2\0\1\20\1\0\1\20"+ + "\1\0\3\20\1\0\1\20\5\0\5\20\1\0\10\20"+ + "\1\61\3\20\2\0\1\20\1\0\1\20\1\0\3\20"+ + "\1\0\1\20\11\0\1\52\14\0\1\52\4\0\1\52"+ + "\5\0\1\52\5\0\5\20\1\0\3\20\1\62\10\20"+ + "\2\0\1\20\1\0\1\20\1\0\3\20\1\0\1\20"+ + "\5\0\5\20\1\0\12\20\1\63\1\20\2\0\1\20"+ + "\1\0\1\20\1\0\3\20\1\0\1\20\5\0\5\20"+ + "\1\0\3\20\1\64\10\20\2\0\1\20\1\0\1\20"+ + "\1\0\3\20\1\0\1\20\5\0\5\20\1\0\7\20"+ + "\1\54\4\20\2\0\1\20\1\0\1\20\1\0\3\20"+ + "\1\0\1\20\5\0\5\20\1\0\6\20\1\62\5\20"+ + "\2\0\1\20\1\0\1\20\1\0\3\20\1\0\1\20"+ + "\5\0\5\20\1\0\7\20\1\65\4\20\2\0\1\20"+ + "\1\0\1\20\1\0\3\20\1\0\1\20\5\0\5\20"+ + "\1\0\7\20\1\66\4\20\2\0\1\20\1\0\1\20"+ + "\1\0\3\20\1\0\1\20\5\0\5\20\1\0\4\20"+ + "\1\67\7\20\2\0\1\20\1\0\1\20\1\0\3\20"+ + "\1\0\1\20\5\0\5\20\1\0\1\70\13\20\2\0"+ + "\1\20\1\0\1\20\1\0\3\20\1\0\1\20\5\0"+ + "\5\20\1\0\1\71\13\20\2\0\1\20\1\0\1\20"+ + "\1\0\3\20\1\0\1\20\5\0\5\20\1\0\12\20"+ + "\1\72\1\20\2\0\1\20\1\0\1\20\1\0\3\20"+ + "\1\0\1\20\5\0\5\20\1\0\5\20\1\73\6\20"+ + "\2\0\1\20\1\0\1\20\1\0\3\20\1\0\1\20"+ + "\5\0\5\20\1\0\3\20\1\74\10\20\2\0\1\20"+ + "\1\0\1\20\1\0\3\20\1\0\1\20\5\0\5\20"+ + "\1\0\10\20\1\75\3\20\2\0\1\20\1\0\1\20"+ + "\1\0\3\20\1\0\1\20\5\0\5\20\1\0\10\20"+ + "\1\76\3\20\2\0\1\20\1\0\1\20\1\0\3\20"+ + "\1\0\1\20\5\0\5\20\1\0\1\20\1\77\12\20"+ + "\2\0\1\20\1\0\1\20\1\0\3\20\1\0\1\20"+ + "\5\0\5\20\1\0\3\20\1\100\10\20\2\0\1\20"+ + "\1\0\1\20\1\0\3\20\1\0\1\20\5\0\5\20"+ + "\1\0\1\77\13\20\2\0\1\20\1\0\1\20\1\0"+ + "\3\20\1\0\1\20\5\0\4\20\1\101\1\0\13\20"+ + "\1\102\1\103\1\0\1\20\1\0\1\101\1\0\3\20"+ + "\1\0\1\101\5\0\5\20\1\0\11\20\1\62\2\20"+ + "\2\0\1\20\1\0\1\20\1\0\3\20\1\0\1\20"+ + "\5\0\4\20\1\101\1\0\13\20\1\101\2\0\1\20"+ + "\1\0\1\101\1\0\3\20\1\0\1\101\11\0\1\104"+ + "\21\0\1\104\5\0\1\104\11\0\1\104\14\0\1\104"+ + "\4\0\1\104\5\0\1\104"; + + private static int [] zzUnpackTrans() { + int [] result = new int[1904]; + int offset = 0; + offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); + return result; + } + + private static int zzUnpackTrans(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int count = packed.charAt(i++); + int value = packed.charAt(i++); + value--; + do result[j++] = value; while (--count > 0); + } + return j; + } + + + /* error codes */ + private static final int ZZ_UNKNOWN_ERROR = 0; + private static final int ZZ_NO_MATCH = 1; + private static final int ZZ_PUSHBACK_2BIG = 2; + + /* error messages for the codes above */ + private static final String ZZ_ERROR_MSG[] = { + "Unkown internal scanner error", + "Error: could not match input", + "Error: pushback value was too large" + }; + + /** + * ZZ_ATTRIBUTE[aState] contains the attributes of state aState + */ + private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); + + private static final String ZZ_ATTRIBUTE_PACKED_0 = + "\3\0\1\11\6\1\1\11\1\1\1\11\1\1\1\11"+ + "\12\1\1\11\1\0\2\11\2\1\1\0\6\1\1\0"+ + "\1\1\1\11\1\1\1\0\27\1\1\0\1\1"; + + private static int [] zzUnpackAttribute() { + int [] result = new int[68]; + int offset = 0; + offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); + return result; + } + + private static int zzUnpackAttribute(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int count = packed.charAt(i++); + int value = packed.charAt(i++); + do result[j++] = value; while (--count > 0); + } + return j; + } + + /** the input device */ + private java.io.Reader zzReader; + + /** the current state of the DFA */ + private int zzState; + + /** the current lexical state */ + private int zzLexicalState = YYINITIAL; + + /** this buffer contains the current text to be matched and is + the source of the yytext() string */ + private char zzBuffer[] = new char[ZZ_BUFFERSIZE]; + + /** the textposition at the last accepting state */ + private int zzMarkedPos; + + /** the current text position in the buffer */ + private int zzCurrentPos; + + /** startRead marks the beginning of the yytext() string in the buffer */ + private int zzStartRead; + + /** endRead marks the last character in the buffer, that has been read + from input */ + private int zzEndRead; + + /** number of newlines encountered up to the start of the matched text */ + private int yyline; + + /** the number of characters up to the start of the matched text */ + private int yychar; + + /** + * the number of characters from the last newline up to the start of the + * matched text + */ + private int yycolumn; + + /** + * zzAtBOL == true <=> the scanner is currently at the beginning of a line + */ + private boolean zzAtBOL = true; + + /** zzAtEOF == true <=> the scanner is at the EOF */ + private boolean zzAtEOF; + + /** denotes if the user-EOF-code has already been executed */ + private boolean zzEOFDone; + + /* user code: */ + + StringBuffer string = new StringBuffer(); + + + /** + * Create an empty lexer, yyrset will be called later to reset and assign + * the reader + */ + public FlasmLexer() { + + } + + public int yychar() { + return yychar; + } + + + + /** + * Creates a new scanner + * There is also a java.io.InputStream version of this constructor. + * + * @param in the java.io.Reader to read input from. + */ + public FlasmLexer(java.io.Reader in) { + this.zzReader = in; + } + + /** + * Creates a new scanner. + * There is also java.io.Reader version of this constructor. + * + * @param in the java.io.Inputstream to read input from. + */ + public FlasmLexer(java.io.InputStream in) { + this(new java.io.InputStreamReader(in)); + } + + /** + * Unpacks the compressed character translation table. + * + * @param packed the packed character translation table + * @return the unpacked character translation table + */ + private static char [] zzUnpackCMap(String packed) { + char [] map = new char[0x10000]; + int i = 0; /* index in packed string */ + int j = 0; /* index in unpacked array */ + while (i < 1736) { + int count = packed.charAt(i++); + char value = packed.charAt(i++); + do map[j++] = value; while (--count > 0); + } + return map; + } + + + /** + * Refills the input buffer. + * + * @return false, iff there was new input. + * + * @exception java.io.IOException if any I/O-Error occurs + */ + private boolean zzRefill() throws java.io.IOException { + + /* first: make room (if you can) */ + if (zzStartRead > 0) { + System.arraycopy(zzBuffer, zzStartRead, + zzBuffer, 0, + zzEndRead-zzStartRead); + + /* translate stored positions */ + zzEndRead-= zzStartRead; + zzCurrentPos-= zzStartRead; + zzMarkedPos-= zzStartRead; + zzStartRead = 0; } - private static int zzUnpackAction(String packed, int offset, int[] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - do result[j++] = value; while (--count > 0); - } - return j; + /* is the buffer big enough? */ + if (zzCurrentPos >= zzBuffer.length) { + /* if not: blow it up */ + char newBuffer[] = new char[zzCurrentPos*2]; + System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length); + zzBuffer = newBuffer; } + /* finally: fill the buffer with new input */ + int numRead = zzReader.read(zzBuffer, zzEndRead, + zzBuffer.length-zzEndRead); - /** - * Translates a state to a row index in the transition table - */ - private static final int[] ZZ_ROWMAP = zzUnpackRowMap(); - - private static final String ZZ_ROWMAP_PACKED_0 = - "\0\0\0\42\0\104\0\146\0\210\0\252\0\314\0\356" + - "\0\u0110\0\146\0\u0132\0\146\0\u0154\0\146\0\u0176\0\u0198" + - "\0\u01ba\0\u01dc\0\u01fe\0\u0220\0\u0242\0\u0264\0\u0286\0\u02a8" + - "\0\u02ca\0\146\0\252\0\146\0\146\0\u02ec\0\u030e\0\u0330" + - "\0\u0352\0\u0374\0\u0396\0\u03b8\0\u03da\0\u03fc\0\u02a8\0\u041e" + - "\0\146\0\u0440\0\u0440\0\u0462\0\u0484\0\u04a6\0\u04c8\0\u04ea" + - "\0\u050c\0\u0198\0\u052e\0\u0550\0\u0572\0\u0594\0\u05b6\0\u05d8" + - "\0\u05fa\0\u061c\0\u063e\0\u0660\0\u0682\0\u06a4\0\u06c6\0\u06e8" + - "\0\u070a\0\u0198\0\u072c\0\u074e"; - - private static int[] zzUnpackRowMap() { - int[] result = new int[68]; - int offset = 0; - offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); - return result; + if (numRead > 0) { + zzEndRead+= numRead; + return false; } - - private static int zzUnpackRowMap(String packed, int offset, int[] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int high = packed.charAt(i++) << 16; - result[j++] = high | packed.charAt(i++); - } - return j; - } - - /** - * The transition table of the DFA - */ - private static final int[] ZZ_TRANS = zzUnpackTrans(); - - private static final String ZZ_TRANS_PACKED_0 = - "\4\4\1\5\1\6\1\4\1\7\1\6\2\4\13\7" + - "\3\4\1\7\3\4\3\7\2\4\1\10\1\11\1\12" + - "\31\10\1\13\3\10\1\14\1\10\1\4\1\15\1\16" + - "\1\17\1\4\1\20\1\4\2\20\1\21\1\4\1\22" + - "\1\23\1\24\1\20\1\25\3\20\1\26\2\20\1\21" + - "\1\27\1\30\1\20\1\4\1\21\1\4\1\20\1\31" + - "\1\20\1\32\1\21\46\0\1\5\42\0\5\33\1\34" + - "\14\33\2\0\1\33\1\0\1\33\1\0\3\33\1\0" + - "\1\33\5\0\2\33\3\7\1\34\14\7\2\0\1\7" + - "\1\0\1\7\1\0\3\7\1\0\1\7\1\10\2\0" + - "\31\10\1\0\3\10\1\0\1\10\2\0\1\12\37\0" + - "\2\35\1\0\23\35\1\36\4\35\1\37\5\35\1\36" + - "\2\0\1\16\37\0\1\17\2\0\37\17\5\0\5\20" + - "\1\0\14\20\2\0\1\20\1\0\1\20\1\0\3\20" + - "\1\0\1\20\11\0\1\21\4\0\1\40\7\0\1\21" + - "\1\0\1\41\1\40\1\0\1\21\5\0\1\21\5\0" + - "\5\20\1\0\1\20\1\42\12\20\2\0\1\20\1\0" + - "\1\20\1\0\3\20\1\0\1\20\5\0\5\20\1\0" + - "\3\20\1\43\10\20\2\0\1\20\1\0\1\20\1\0" + - "\3\20\1\0\1\20\5\0\5\20\1\0\10\20\1\44" + - "\3\20\2\0\1\20\1\0\1\20\1\0\3\20\1\0" + - "\1\20\5\0\5\20\1\0\5\20\1\45\6\20\2\0" + - "\1\20\1\0\1\20\1\0\3\20\1\0\1\20\5\0" + - "\5\20\1\0\2\20\1\46\11\20\2\0\1\20\1\0" + - "\1\20\1\0\3\20\1\0\1\20\11\0\1\21\14\0" + - "\1\21\1\0\1\47\2\0\1\21\5\0\1\21\11\0" + - "\1\41\14\0\1\41\4\0\1\41\5\0\1\41\5\0" + - "\5\20\1\0\14\20\2\0\1\20\1\0\1\20\1\0" + - "\2\20\1\50\1\0\1\20\26\0\1\37\4\0\1\37" + - "\5\0\1\37\26\0\1\51\4\0\1\51\5\0\1\51" + - "\11\0\1\52\14\0\1\52\1\53\2\0\1\53\1\52" + - "\5\0\1\52\11\0\1\41\4\0\1\40\7\0\1\41" + - "\2\0\1\40\1\0\1\41\5\0\1\41\5\0\5\20" + - "\1\0\2\20\1\54\11\20\2\0\1\20\1\0\1\20" + - "\1\0\3\20\1\0\1\20\5\0\5\20\1\0\14\20" + - "\2\0\1\20\1\0\1\20\1\0\1\55\2\20\1\0" + - "\1\20\5\0\5\20\1\0\11\20\1\56\2\20\2\0" + - "\1\20\1\0\1\20\1\0\3\20\1\0\1\20\5\0" + - "\5\20\1\0\6\20\1\57\5\20\2\0\1\20\1\0" + - "\1\20\1\0\3\20\1\0\1\20\5\0\5\20\1\0" + - "\6\20\1\60\5\20\2\0\1\20\1\0\1\20\1\0" + - "\3\20\1\0\1\20\5\0\5\20\1\0\10\20\1\61" + - "\3\20\2\0\1\20\1\0\1\20\1\0\3\20\1\0" + - "\1\20\11\0\1\52\14\0\1\52\4\0\1\52\5\0" + - "\1\52\5\0\5\20\1\0\3\20\1\62\10\20\2\0" + - "\1\20\1\0\1\20\1\0\3\20\1\0\1\20\5\0" + - "\5\20\1\0\12\20\1\63\1\20\2\0\1\20\1\0" + - "\1\20\1\0\3\20\1\0\1\20\5\0\5\20\1\0" + - "\3\20\1\64\10\20\2\0\1\20\1\0\1\20\1\0" + - "\3\20\1\0\1\20\5\0\5\20\1\0\7\20\1\54" + - "\4\20\2\0\1\20\1\0\1\20\1\0\3\20\1\0" + - "\1\20\5\0\5\20\1\0\6\20\1\62\5\20\2\0" + - "\1\20\1\0\1\20\1\0\3\20\1\0\1\20\5\0" + - "\5\20\1\0\7\20\1\65\4\20\2\0\1\20\1\0" + - "\1\20\1\0\3\20\1\0\1\20\5\0\5\20\1\0" + - "\7\20\1\66\4\20\2\0\1\20\1\0\1\20\1\0" + - "\3\20\1\0\1\20\5\0\5\20\1\0\4\20\1\67" + - "\7\20\2\0\1\20\1\0\1\20\1\0\3\20\1\0" + - "\1\20\5\0\5\20\1\0\1\70\13\20\2\0\1\20" + - "\1\0\1\20\1\0\3\20\1\0\1\20\5\0\5\20" + - "\1\0\1\71\13\20\2\0\1\20\1\0\1\20\1\0" + - "\3\20\1\0\1\20\5\0\5\20\1\0\12\20\1\72" + - "\1\20\2\0\1\20\1\0\1\20\1\0\3\20\1\0" + - "\1\20\5\0\5\20\1\0\5\20\1\73\6\20\2\0" + - "\1\20\1\0\1\20\1\0\3\20\1\0\1\20\5\0" + - "\5\20\1\0\3\20\1\74\10\20\2\0\1\20\1\0" + - "\1\20\1\0\3\20\1\0\1\20\5\0\5\20\1\0" + - "\10\20\1\75\3\20\2\0\1\20\1\0\1\20\1\0" + - "\3\20\1\0\1\20\5\0\5\20\1\0\10\20\1\76" + - "\3\20\2\0\1\20\1\0\1\20\1\0\3\20\1\0" + - "\1\20\5\0\5\20\1\0\1\20\1\77\12\20\2\0" + - "\1\20\1\0\1\20\1\0\3\20\1\0\1\20\5\0" + - "\5\20\1\0\3\20\1\100\10\20\2\0\1\20\1\0" + - "\1\20\1\0\3\20\1\0\1\20\5\0\5\20\1\0" + - "\1\77\13\20\2\0\1\20\1\0\1\20\1\0\3\20" + - "\1\0\1\20\5\0\4\20\1\101\1\0\13\20\1\102" + - "\1\103\1\0\1\20\1\0\1\101\1\0\3\20\1\0" + - "\1\101\5\0\5\20\1\0\11\20\1\62\2\20\2\0" + - "\1\20\1\0\1\20\1\0\3\20\1\0\1\20\5\0" + - "\4\20\1\101\1\0\13\20\1\101\2\0\1\20\1\0" + - "\1\101\1\0\3\20\1\0\1\101\11\0\1\104\21\0" + - "\1\104\5\0\1\104\11\0\1\104\14\0\1\104\4\0" + - "\1\104\5\0\1\104"; - - private static int[] zzUnpackTrans() { - int[] result = new int[1904]; - int offset = 0; - offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); - return result; - } - - private static int zzUnpackTrans(String packed, int offset, int[] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - value--; - do result[j++] = value; while (--count > 0); - } - return j; - } - - - /* error codes */ - private static final int ZZ_UNKNOWN_ERROR = 0; - private static final int ZZ_NO_MATCH = 1; - private static final int ZZ_PUSHBACK_2BIG = 2; - - /* error messages for the codes above */ - private static final String ZZ_ERROR_MSG[] = { - "Unkown internal scanner error", - "Error: could not match input", - "Error: pushback value was too large" - }; - - /** - * ZZ_ATTRIBUTE[aState] contains the attributes of state aState - */ - private static final int[] ZZ_ATTRIBUTE = zzUnpackAttribute(); - - private static final String ZZ_ATTRIBUTE_PACKED_0 = - "\3\0\1\11\5\1\1\11\1\1\1\11\1\1\1\11" + - "\13\1\1\11\1\0\2\11\2\1\1\0\6\1\1\0" + - "\1\1\1\11\1\1\1\0\27\1\1\0\1\1"; - - private static int[] zzUnpackAttribute() { - int[] result = new int[68]; - int offset = 0; - offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); - return result; - } - - private static int zzUnpackAttribute(String packed, int offset, int[] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - do result[j++] = value; while (--count > 0); - } - return j; - } - - /** - * the input device - */ - private java.io.Reader zzReader; - - /** - * the current state of the DFA - */ - private int zzState; - - /** - * the current lexical state - */ - private int zzLexicalState = YYINITIAL; - - /** - * this buffer contains the current text to be matched and is - * the source of the yytext() string - */ - private char zzBuffer[] = new char[ZZ_BUFFERSIZE]; - - /** - * the textposition at the last accepting state - */ - private int zzMarkedPos; - - /** - * the current text position in the buffer - */ - private int zzCurrentPos; - - /** - * startRead marks the beginning of the yytext() string in the buffer - */ - private int zzStartRead; - - /** - * endRead marks the last character in the buffer, that has been read - * from input - */ - private int zzEndRead; - - /** - * number of newlines encountered up to the start of the matched text - */ - private int yyline; - - /** - * the number of characters up to the start of the matched text - */ - private int yychar; - - /** - * the number of characters from the last newline up to the start of the - * matched text - */ - private int yycolumn; - - /** - * zzAtBOL == true <=> the scanner is currently at the beginning of a line - */ - private boolean zzAtBOL = true; - - /** - * zzAtEOF == true <=> the scanner is at the EOF - */ - private boolean zzAtEOF; - - /** - * denotes if the user-EOF-code has already been executed - */ - private boolean zzEOFDone; - - /* user code: */ - - StringBuffer string = new StringBuffer(); - - - /** - * Create an empty lexer, yyrset will be called later to reset and assign - * the reader - */ - public FlasmLexer() { - - } - - public int yychar() { - return yychar; - } - - - /** - * Creates a new scanner - * There is also a java.io.InputStream version of this constructor. - * - * @param in the java.io.Reader to read input from. - */ - public FlasmLexer(java.io.Reader in) { - this.zzReader = in; - } - - /** - * Creates a new scanner. - * There is also java.io.Reader version of this constructor. - * - * @param in the java.io.Inputstream to read input from. - */ - public FlasmLexer(java.io.InputStream in) { - this(new java.io.InputStreamReader(in)); - } - - /** - * Unpacks the compressed character translation table. - * - * @param packed the packed character translation table - * @return the unpacked character translation table - */ - private static char[] zzUnpackCMap(String packed) { - char[] map = new char[0x10000]; - int i = 0; /* index in packed string */ - int j = 0; /* index in unpacked array */ - while (i < 1736) { - int count = packed.charAt(i++); - char value = packed.charAt(i++); - do map[j++] = value; while (--count > 0); - } - return map; - } - - - /** - * Refills the input buffer. - * - * @return false, iff there was new input. - * @throws java.io.IOException if any I/O-Error occurs - */ - private boolean zzRefill() throws java.io.IOException { - - /* first: make room (if you can) */ - if (zzStartRead > 0) { - System.arraycopy(zzBuffer, zzStartRead, - zzBuffer, 0, - zzEndRead - zzStartRead); - - /* translate stored positions */ - zzEndRead -= zzStartRead; - zzCurrentPos -= zzStartRead; - zzMarkedPos -= zzStartRead; - zzStartRead = 0; - } - - /* is the buffer big enough? */ - if (zzCurrentPos >= zzBuffer.length) { - /* if not: blow it up */ - char newBuffer[] = new char[zzCurrentPos * 2]; - System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length); - zzBuffer = newBuffer; - } - - /* finally: fill the buffer with new input */ - int numRead = zzReader.read(zzBuffer, zzEndRead, - zzBuffer.length - zzEndRead); - - if (numRead > 0) { - zzEndRead += numRead; - return false; - } - // unlikely but not impossible: read 0 characters, but not at end of stream - if (numRead == 0) { - int c = zzReader.read(); - if (c == -1) { - return true; - } else { - zzBuffer[zzEndRead++] = (char) c; - return false; - } - } - - // numRead < 0 + // unlikely but not impossible: read 0 characters, but not at end of stream + if (numRead == 0) { + int c = zzReader.read(); + if (c == -1) { return true; + } else { + zzBuffer[zzEndRead++] = (char) c; + return false; + } } + // numRead < 0 + return true; + } - /** - * Closes the input stream. - */ - public final void yyclose() throws java.io.IOException { - zzAtEOF = true; /* indicate end of file */ - zzEndRead = zzStartRead; /* invalidate buffer */ + + /** + * Closes the input stream. + */ + public final void yyclose() throws java.io.IOException { + zzAtEOF = true; /* indicate end of file */ + zzEndRead = zzStartRead; /* invalidate buffer */ - if (zzReader != null) - zzReader.close(); + if (zzReader != null) + zzReader.close(); + } + + + /** + * Resets the scanner to read from a new input stream. + * Does not close the old reader. + * + * All internal variables are reset, the old input stream + * cannot be reused (internal buffer is discarded and lost). + * Lexical state is set to ZZ_INITIAL. + * + * @param reader the new input stream + */ + public final void yyreset(java.io.Reader reader) { + zzReader = reader; + zzAtBOL = true; + zzAtEOF = false; + zzEOFDone = false; + zzEndRead = zzStartRead = 0; + zzCurrentPos = zzMarkedPos = 0; + yyline = yychar = yycolumn = 0; + zzLexicalState = YYINITIAL; + } + + + /** + * Returns the current lexical state. + */ + public final int yystate() { + return zzLexicalState; + } + + + /** + * Enters a new lexical state + * + * @param newState the new lexical state + */ + public final void yybegin(int newState) { + zzLexicalState = newState; + } + + + /** + * Returns the text matched by the current regular expression. + */ + public final String yytext() { + return new String( zzBuffer, zzStartRead, zzMarkedPos-zzStartRead ); + } + + + /** + * Returns the character at position pos from the + * matched text. + * + * It is equivalent to yytext().charAt(pos), but faster + * + * @param pos the position of the character to fetch. + * A value from 0 to yylength()-1. + * + * @return the character at position pos + */ + public final char yycharat(int pos) { + return zzBuffer[zzStartRead+pos]; + } + + + /** + * Returns the length of the matched text region. + */ + public final int yylength() { + return zzMarkedPos-zzStartRead; + } + + + /** + * Reports an error that occured while scanning. + * + * In a wellformed scanner (no or only correct usage of + * yypushback(int) and a match-all fallback rule) this method + * will only be called with things that "Can't Possibly Happen". + * If this method is called, something is seriously wrong + * (e.g. a JFlex bug producing a faulty scanner etc.). + * + * Usual syntax/scanner level error handling should be done + * in error fallback rules. + * + * @param errorCode the code of the errormessage to display + */ + private void zzScanError(int errorCode) { + String message; + try { + message = ZZ_ERROR_MSG[errorCode]; + } + catch (ArrayIndexOutOfBoundsException e) { + message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR]; } - - /** - * Resets the scanner to read from a new input stream. - * Does not close the old reader. - *

- * All internal variables are reset, the old input stream - * cannot be reused (internal buffer is discarded and lost). - * Lexical state is set to ZZ_INITIAL. - * - * @param reader the new input stream - */ - public final void yyreset(java.io.Reader reader) { - zzReader = reader; - zzAtBOL = true; - zzAtEOF = false; - zzEOFDone = false; - zzEndRead = zzStartRead = 0; - zzCurrentPos = zzMarkedPos = 0; - yyline = yychar = yycolumn = 0; - zzLexicalState = YYINITIAL; - } + throw new Error(message); + } - /** - * Returns the current lexical state. - */ - public final int yystate() { - return zzLexicalState; - } + /** + * Pushes the specified amount of characters back into the input stream. + * + * They will be read again by then next call of the scanning method + * + * @param number the number of characters to be read again. + * This number must not be greater than yylength()! + */ + public void yypushback(int number) { + if ( number > yylength() ) + zzScanError(ZZ_PUSHBACK_2BIG); + + zzMarkedPos -= number; + } - /** - * Enters a new lexical state - * - * @param newState the new lexical state - */ - public final void yybegin(int newState) { - zzLexicalState = newState; - } + /** + * Resumes scanning until the next regular expression is matched, + * the end of input is encountered or an I/O-Error occurs. + * + * @return the next token + * @exception java.io.IOException if any I/O-Error occurs + */ + public Token yylex() throws java.io.IOException { + int zzInput; + int zzAction; + + // cached fields: + int zzCurrentPosL; + int zzMarkedPosL; + int zzEndReadL = zzEndRead; + char [] zzBufferL = zzBuffer; + char [] zzCMapL = ZZ_CMAP; + + int [] zzTransL = ZZ_TRANS; + int [] zzRowMapL = ZZ_ROWMAP; + int [] zzAttrL = ZZ_ATTRIBUTE; + + while (true) { + zzMarkedPosL = zzMarkedPos; + + yychar+= zzMarkedPosL-zzStartRead; + + zzAction = -1; + + zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL; + + zzState = ZZ_LEXSTATE[zzLexicalState]; - /** - * Returns the text matched by the current regular expression. - */ - public final String yytext() { - return new String(zzBuffer, zzStartRead, zzMarkedPos - zzStartRead); - } - - - /** - * Returns the character at position pos from the - * matched text. - *

- * It is equivalent to yytext().charAt(pos), but faster - * - * @param pos the position of the character to fetch. - * A value from 0 to yylength()-1. - * @return the character at position pos - */ - public final char yycharat(int pos) { - return zzBuffer[zzStartRead + pos]; - } - - - /** - * Returns the length of the matched text region. - */ - public final int yylength() { - return zzMarkedPos - zzStartRead; - } - - - /** - * Reports an error that occured while scanning. - *

- * In a wellformed scanner (no or only correct usage of - * yypushback(int) and a match-all fallback rule) this method - * will only be called with things that "Can't Possibly Happen". - * If this method is called, something is seriously wrong - * (e.g. a JFlex bug producing a faulty scanner etc.). - *

- * Usual syntax/scanner level error handling should be done - * in error fallback rules. - * - * @param errorCode the code of the errormessage to display - */ - private void zzScanError(int errorCode) { - String message; - try { - message = ZZ_ERROR_MSG[errorCode]; - } - catch (ArrayIndexOutOfBoundsException e) { - message = ZZ_ERROR_MSG[ZZ_UNKNOWN_ERROR]; - } - - throw new Error(message); - } - - - /** - * Pushes the specified amount of characters back into the input stream. - *

- * They will be read again by then next call of the scanning method - * - * @param number the number of characters to be read again. - * This number must not be greater than yylength()! - */ - public void yypushback(int number) { - if (number > yylength()) - zzScanError(ZZ_PUSHBACK_2BIG); - - zzMarkedPos -= number; - } - - - /** - * Resumes scanning until the next regular expression is matched, - * the end of input is encountered or an I/O-Error occurs. - * - * @return the next token - * @throws java.io.IOException if any I/O-Error occurs - */ - public Token yylex() throws java.io.IOException { - int zzInput; - int zzAction; - - // cached fields: - int zzCurrentPosL; - int zzMarkedPosL; - int zzEndReadL = zzEndRead; - char[] zzBufferL = zzBuffer; - char[] zzCMapL = ZZ_CMAP; - - int[] zzTransL = ZZ_TRANS; - int[] zzRowMapL = ZZ_ROWMAP; - int[] zzAttrL = ZZ_ATTRIBUTE; - + zzForAction: { while (true) { - zzMarkedPosL = zzMarkedPos; - - yychar += zzMarkedPosL - zzStartRead; - - zzAction = -1; - - zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL; - - zzState = ZZ_LEXSTATE[zzLexicalState]; - - - zzForAction: - { - while (true) { - - if (zzCurrentPosL < zzEndReadL) - zzInput = zzBufferL[zzCurrentPosL++]; - else if (zzAtEOF) { - zzInput = YYEOF; - break zzForAction; - } else { - // store back cached positions - zzCurrentPos = zzCurrentPosL; - zzMarkedPos = zzMarkedPosL; - boolean eof = zzRefill(); - // get translated positions and possibly new buffer - zzCurrentPosL = zzCurrentPos; - zzMarkedPosL = zzMarkedPos; - zzBufferL = zzBuffer; - zzEndReadL = zzEndRead; - if (eof) { - zzInput = YYEOF; - break zzForAction; - } else { - zzInput = zzBufferL[zzCurrentPosL++]; - } - } - int zzNext = zzTransL[zzRowMapL[zzState] + zzCMapL[zzInput]]; - if (zzNext == -1) break zzForAction; - zzState = zzNext; - - int zzAttributes = zzAttrL[zzState]; - if ((zzAttributes & 1) == 1) { - zzAction = zzState; - zzMarkedPosL = zzCurrentPosL; - if ((zzAttributes & 8) == 8) break zzForAction; - } - - } + + if (zzCurrentPosL < zzEndReadL) + zzInput = zzBufferL[zzCurrentPosL++]; + else if (zzAtEOF) { + zzInput = YYEOF; + break zzForAction; + } + else { + // store back cached positions + zzCurrentPos = zzCurrentPosL; + zzMarkedPos = zzMarkedPosL; + boolean eof = zzRefill(); + // get translated positions and possibly new buffer + zzCurrentPosL = zzCurrentPos; + zzMarkedPosL = zzMarkedPos; + zzBufferL = zzBuffer; + zzEndReadL = zzEndRead; + if (eof) { + zzInput = YYEOF; + break zzForAction; } - - // store back cached position - zzMarkedPos = zzMarkedPosL; - - switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { - case 4: { - yybegin(YYINITIAL); - return token(TokenType.ERROR, tokenStart, tokenLength); - } - case 15: - break; - case 13: { - return token(TokenType.KEYWORD); - } - case 16: - break; - case 11: { - return token(TokenType.IDENTIFIER, yychar, yylength() - 1); - } - case 17: - break; - case 10: { - yybegin(STRING); - tokenStart = yychar; - tokenLength = 1; - } - case 18: - break; - case 14: { - return token(TokenType.KEYWORD2); - } - case 19: - break; - case 12: { - tokenLength += 2; - } - case 20: - break; - case 5: { - yybegin(PARAMETERS); - // length also includes the trailing quote - return token(TokenType.STRING, tokenStart, tokenLength + 1); - } - case 21: - break; - case 8: { - return token(TokenType.IDENTIFIER); - } - case 22: - break; - case 2: { - yybegin(PARAMETERS); - return token(TokenType.KEYWORD); - } - case 23: - break; - case 7: { - return token(TokenType.COMMENT); - } - case 24: - break; - case 9: { - return token(TokenType.NUMBER); - } - case 25: - break; - case 6: { - yybegin(YYINITIAL); - } - case 26: - break; - case 1: { - } - case 27: - break; - case 3: { - tokenLength += yylength(); - } - case 28: - break; - default: - if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { - zzAtEOF = true; - { - return null; - } - } else { - zzScanError(ZZ_NO_MATCH); - } + else { + zzInput = zzBufferL[zzCurrentPosL++]; } + } + int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ]; + if (zzNext == -1) break zzForAction; + zzState = zzNext; + + int zzAttributes = zzAttrL[zzState]; + if ( (zzAttributes & 1) == 1 ) { + zzAction = zzState; + zzMarkedPosL = zzCurrentPosL; + if ( (zzAttributes & 8) == 8 ) break zzForAction; + } + } + } + + // store back cached position + zzMarkedPos = zzMarkedPosL; + + switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { + case 5: + { yybegin(YYINITIAL); + return token(TokenType.ERROR,tokenStart, tokenLength); + } + case 15: break; + case 13: + { return token(TokenType.KEYWORD); + } + case 16: break; + case 11: + { return token(TokenType.IDENTIFIER,yychar,yylength()-1); + } + case 17: break; + case 10: + { yybegin(STRING); + tokenStart = yychar; + tokenLength = 1; + } + case 18: break; + case 14: + { return token(TokenType.KEYWORD2); + } + case 19: break; + case 12: + { tokenLength += 2; + } + case 20: break; + case 6: + { yybegin(PARAMETERS); + // length also includes the trailing quote + return token(TokenType.STRING, tokenStart, tokenLength + 1); + } + case 21: break; + case 8: + { return token(TokenType.IDENTIFIER); + } + case 22: break; + case 3: + { yybegin(PARAMETERS); + return token(TokenType.KEYWORD); + } + case 23: break; + case 2: + { return token(TokenType.COMMENT); + } + case 24: break; + case 9: + { return token(TokenType.NUMBER); + } + case 25: break; + case 7: + { yybegin(YYINITIAL); + } + case 26: break; + case 1: + { + } + case 27: break; + case 4: + { tokenLength += yylength(); + } + case 28: break; + default: + if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { + zzAtEOF = true; + { + return null; + } + } + else { + zzScanError(ZZ_NO_MATCH); + } + } } + } } diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/FlasmLexer.java~ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/FlasmLexer.java~ index 23f57eaf8..4a79f2529 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/FlasmLexer.java~ +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/FlasmLexer.java~ @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 10.8.10 18:04 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* Flash assembler language lexer specification */ @@ -12,8 +12,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 10.8.10 18:04 from the specification file - * D:/Dokumenty/Programovani/JavaSE/ASDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/flasm.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/flasm.flex */ public final class FlasmLexer extends DefaultJFlexLexer { @@ -43,10 +43,10 @@ public final class FlasmLexer extends DefaultJFlexLexer { */ private static final String ZZ_CMAP_PACKED = "\11\6\1\4\1\2\1\0\1\4\1\1\16\6\4\0\1\4\1\0"+ - "\1\37\1\0\1\5\6\0\1\31\1\0\1\31\1\27\1\0\1\26"+ - "\3\40\4\32\2\11\1\12\1\3\5\0\4\7\1\30\25\7\1\0"+ - "\1\33\2\0\1\10\1\0\1\20\1\7\1\35\1\24\1\16\1\17"+ - "\1\34\1\7\1\25\2\7\1\21\1\7\1\23\1\36\2\7\1\14"+ + "\1\40\1\0\1\5\6\0\1\32\1\0\1\27\1\30\1\0\1\26"+ + "\3\41\4\33\2\11\1\12\1\3\5\0\4\7\1\31\25\7\1\0"+ + "\1\34\2\0\1\10\1\0\1\20\1\7\1\36\1\24\1\16\1\17"+ + "\1\35\1\7\1\25\2\7\1\21\1\7\1\23\1\37\2\7\1\14"+ "\1\22\1\13\1\15\5\7\1\0\1\0\1\0\1\0\41\6\2\0"+ "\4\5\4\0\1\5\2\0\1\6\7\0\1\5\4\0\1\5\5\0"+ "\27\5\1\0\37\5\1\0\u013f\5\31\0\162\5\4\0\14\5\16\0"+ @@ -142,12 +142,13 @@ public final class FlasmLexer extends DefaultJFlexLexer { private static final String ZZ_ACTION_PACKED_0 = "\3\0\3\1\1\2\1\3\2\4\1\1\1\5\2\6"+ - "\1\7\1\10\1\11\5\10\1\1\1\10\1\12\1\0"+ - "\1\13\1\14\2\3\1\0\1\11\6\10\1\3\1\11"+ - "\1\0\6\10\1\15\16\10\2\16"; + "\1\7\1\10\1\11\5\10\2\1\1\10\1\12\1\0"+ + "\1\13\1\14\2\3\1\0\1\11\5\10\1\0\1\10"+ + "\1\3\1\11\1\0\6\10\1\15\16\10\2\16\1\0"+ + "\1\16"; private static int [] zzUnpackAction() { - int [] result = new int[64]; + int [] result = new int[68]; int offset = 0; offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); return result; @@ -172,17 +173,18 @@ public final class FlasmLexer extends DefaultJFlexLexer { private static final int [] ZZ_ROWMAP = zzUnpackRowMap(); private static final String ZZ_ROWMAP_PACKED_0 = - "\0\0\0\41\0\102\0\143\0\204\0\245\0\306\0\347"+ - "\0\u0108\0\143\0\u0129\0\143\0\u014a\0\143\0\u016b\0\u018c"+ - "\0\u01ad\0\u01ce\0\u01ef\0\u0210\0\u0231\0\u0252\0\u0273\0\u0294"+ - "\0\143\0\245\0\143\0\143\0\u02b5\0\u02d6\0\u02f7\0\u0318"+ - "\0\u0339\0\u035a\0\u037b\0\u039c\0\u03bd\0\u03de\0\143\0\u03ff"+ - "\0\u03ff\0\u0420\0\u0441\0\u0462\0\u0483\0\u04a4\0\u04c5\0\u018c"+ - "\0\u04e6\0\u0507\0\u0528\0\u0549\0\u056a\0\u058b\0\u05ac\0\u05cd"+ - "\0\u05ee\0\u060f\0\u0630\0\u0651\0\u0672\0\u0693\0\u06b4\0\u018c"; + "\0\0\0\42\0\104\0\146\0\210\0\252\0\314\0\356"+ + "\0\u0110\0\146\0\u0132\0\146\0\u0154\0\146\0\u0176\0\u0198"+ + "\0\u01ba\0\u01dc\0\u01fe\0\u0220\0\u0242\0\u0264\0\u0286\0\u02a8"+ + "\0\u02ca\0\146\0\252\0\146\0\146\0\u02ec\0\u030e\0\u0330"+ + "\0\u0352\0\u0374\0\u0396\0\u03b8\0\u03da\0\u03fc\0\u02a8\0\u041e"+ + "\0\146\0\u0440\0\u0440\0\u0462\0\u0484\0\u04a6\0\u04c8\0\u04ea"+ + "\0\u050c\0\u0198\0\u052e\0\u0550\0\u0572\0\u0594\0\u05b6\0\u05d8"+ + "\0\u05fa\0\u061c\0\u063e\0\u0660\0\u0682\0\u06a4\0\u06c6\0\u06e8"+ + "\0\u070a\0\u0198\0\u072c\0\u074e"; private static int [] zzUnpackRowMap() { - int [] result = new int[64]; + int [] result = new int[68]; int offset = 0; offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); return result; @@ -206,87 +208,91 @@ public final class FlasmLexer extends DefaultJFlexLexer { private static final String ZZ_TRANS_PACKED_0 = "\4\4\1\5\1\6\1\4\1\7\1\6\2\4\13\7"+ - "\2\4\1\7\3\4\3\7\2\4\1\10\1\11\1\12"+ - "\30\10\1\13\3\10\1\14\1\10\1\4\1\15\1\16"+ + "\3\4\1\7\3\4\3\7\2\4\1\10\1\11\1\12"+ + "\31\10\1\13\3\10\1\14\1\10\1\4\1\15\1\16"+ "\1\17\1\4\1\20\1\4\2\20\1\21\1\4\1\22"+ "\1\23\1\24\1\20\1\25\3\20\1\26\2\20\1\21"+ - "\1\27\1\20\1\4\1\21\1\4\1\20\1\30\1\20"+ - "\1\31\1\21\45\0\1\5\41\0\5\32\1\33\14\32"+ - "\1\0\1\32\1\0\1\32\1\0\3\32\1\0\1\32"+ - "\5\0\2\32\3\7\1\33\14\7\1\0\1\7\1\0"+ - "\1\7\1\0\3\7\1\0\1\7\1\10\2\0\30\10"+ - "\1\0\3\10\1\0\1\10\2\0\1\12\36\0\2\34"+ - "\1\0\23\34\1\35\3\34\1\36\5\34\1\35\2\0"+ - "\1\16\36\0\1\17\2\0\36\17\5\0\5\20\1\0"+ - "\14\20\1\0\1\20\1\0\1\20\1\0\3\20\1\0"+ - "\1\20\11\0\1\21\4\0\1\37\7\0\1\21\1\40"+ - "\1\37\1\0\1\21\5\0\1\21\5\0\5\20\1\0"+ - "\1\20\1\41\12\20\1\0\1\20\1\0\1\20\1\0"+ - "\3\20\1\0\1\20\5\0\5\20\1\0\3\20\1\42"+ - "\10\20\1\0\1\20\1\0\1\20\1\0\3\20\1\0"+ - "\1\20\5\0\5\20\1\0\10\20\1\43\3\20\1\0"+ - "\1\20\1\0\1\20\1\0\3\20\1\0\1\20\5\0"+ - "\5\20\1\0\5\20\1\44\6\20\1\0\1\20\1\0"+ + "\1\27\1\30\1\20\1\4\1\21\1\4\1\20\1\31"+ + "\1\20\1\32\1\21\46\0\1\5\42\0\5\33\1\34"+ + "\14\33\2\0\1\33\1\0\1\33\1\0\3\33\1\0"+ + "\1\33\5\0\2\33\3\7\1\34\14\7\2\0\1\7"+ + "\1\0\1\7\1\0\3\7\1\0\1\7\1\10\2\0"+ + "\31\10\1\0\3\10\1\0\1\10\2\0\1\12\37\0"+ + "\2\35\1\0\23\35\1\36\4\35\1\37\5\35\1\36"+ + "\2\0\1\16\37\0\1\17\2\0\37\17\5\0\5\20"+ + "\1\0\14\20\2\0\1\20\1\0\1\20\1\0\3\20"+ + "\1\0\1\20\11\0\1\21\4\0\1\40\7\0\1\21"+ + "\1\0\1\41\1\40\1\0\1\21\5\0\1\21\5\0"+ + "\5\20\1\0\1\20\1\42\12\20\2\0\1\20\1\0"+ "\1\20\1\0\3\20\1\0\1\20\5\0\5\20\1\0"+ - "\2\20\1\45\11\20\1\0\1\20\1\0\1\20\1\0"+ - "\3\20\1\0\1\20\11\0\1\40\14\0\1\40\3\0"+ - "\1\40\5\0\1\40\5\0\5\20\1\0\14\20\1\0"+ - "\1\20\1\0\1\20\1\0\2\20\1\46\1\0\1\20"+ - "\26\0\1\36\3\0\1\36\5\0\1\36\26\0\1\47"+ - "\3\0\1\47\5\0\1\47\11\0\1\50\14\0\1\50"+ - "\2\0\1\51\1\50\5\0\1\50\11\0\1\40\4\0"+ - "\1\37\7\0\1\40\1\0\1\37\1\0\1\40\5\0"+ - "\1\40\5\0\5\20\1\0\2\20\1\52\11\20\1\0"+ + "\3\20\1\43\10\20\2\0\1\20\1\0\1\20\1\0"+ + "\3\20\1\0\1\20\5\0\5\20\1\0\10\20\1\44"+ + "\3\20\2\0\1\20\1\0\1\20\1\0\3\20\1\0"+ + "\1\20\5\0\5\20\1\0\5\20\1\45\6\20\2\0"+ "\1\20\1\0\1\20\1\0\3\20\1\0\1\20\5\0"+ - "\5\20\1\0\14\20\1\0\1\20\1\0\1\20\1\0"+ - "\1\53\2\20\1\0\1\20\5\0\5\20\1\0\11\20"+ - "\1\54\2\20\1\0\1\20\1\0\1\20\1\0\3\20"+ - "\1\0\1\20\5\0\5\20\1\0\6\20\1\55\5\20"+ - "\1\0\1\20\1\0\1\20\1\0\3\20\1\0\1\20"+ - "\5\0\5\20\1\0\6\20\1\56\5\20\1\0\1\20"+ + "\5\20\1\0\2\20\1\46\11\20\2\0\1\20\1\0"+ + "\1\20\1\0\3\20\1\0\1\20\11\0\1\21\14\0"+ + "\1\21\1\0\1\47\2\0\1\21\5\0\1\21\11\0"+ + "\1\41\14\0\1\41\4\0\1\41\5\0\1\41\5\0"+ + "\5\20\1\0\14\20\2\0\1\20\1\0\1\20\1\0"+ + "\2\20\1\50\1\0\1\20\26\0\1\37\4\0\1\37"+ + "\5\0\1\37\26\0\1\51\4\0\1\51\5\0\1\51"+ + "\11\0\1\52\14\0\1\52\1\53\2\0\1\53\1\52"+ + "\5\0\1\52\11\0\1\41\4\0\1\40\7\0\1\41"+ + "\2\0\1\40\1\0\1\41\5\0\1\41\5\0\5\20"+ + "\1\0\2\20\1\54\11\20\2\0\1\20\1\0\1\20"+ + "\1\0\3\20\1\0\1\20\5\0\5\20\1\0\14\20"+ + "\2\0\1\20\1\0\1\20\1\0\1\55\2\20\1\0"+ + "\1\20\5\0\5\20\1\0\11\20\1\56\2\20\2\0"+ + "\1\20\1\0\1\20\1\0\3\20\1\0\1\20\5\0"+ + "\5\20\1\0\6\20\1\57\5\20\2\0\1\20\1\0"+ + "\1\20\1\0\3\20\1\0\1\20\5\0\5\20\1\0"+ + "\6\20\1\60\5\20\2\0\1\20\1\0\1\20\1\0"+ + "\3\20\1\0\1\20\5\0\5\20\1\0\10\20\1\61"+ + "\3\20\2\0\1\20\1\0\1\20\1\0\3\20\1\0"+ + "\1\20\11\0\1\52\14\0\1\52\4\0\1\52\5\0"+ + "\1\52\5\0\5\20\1\0\3\20\1\62\10\20\2\0"+ + "\1\20\1\0\1\20\1\0\3\20\1\0\1\20\5\0"+ + "\5\20\1\0\12\20\1\63\1\20\2\0\1\20\1\0"+ + "\1\20\1\0\3\20\1\0\1\20\5\0\5\20\1\0"+ + "\3\20\1\64\10\20\2\0\1\20\1\0\1\20\1\0"+ + "\3\20\1\0\1\20\5\0\5\20\1\0\7\20\1\54"+ + "\4\20\2\0\1\20\1\0\1\20\1\0\3\20\1\0"+ + "\1\20\5\0\5\20\1\0\6\20\1\62\5\20\2\0"+ + "\1\20\1\0\1\20\1\0\3\20\1\0\1\20\5\0"+ + "\5\20\1\0\7\20\1\65\4\20\2\0\1\20\1\0"+ + "\1\20\1\0\3\20\1\0\1\20\5\0\5\20\1\0"+ + "\7\20\1\66\4\20\2\0\1\20\1\0\1\20\1\0"+ + "\3\20\1\0\1\20\5\0\5\20\1\0\4\20\1\67"+ + "\7\20\2\0\1\20\1\0\1\20\1\0\3\20\1\0"+ + "\1\20\5\0\5\20\1\0\1\70\13\20\2\0\1\20"+ "\1\0\1\20\1\0\3\20\1\0\1\20\5\0\5\20"+ - "\1\0\10\20\1\57\3\20\1\0\1\20\1\0\1\20"+ - "\1\0\3\20\1\0\1\20\11\0\1\50\14\0\1\50"+ - "\3\0\1\50\5\0\1\50\5\0\5\20\1\0\3\20"+ - "\1\60\10\20\1\0\1\20\1\0\1\20\1\0\3\20"+ - "\1\0\1\20\5\0\5\20\1\0\12\20\1\61\1\20"+ - "\1\0\1\20\1\0\1\20\1\0\3\20\1\0\1\20"+ - "\5\0\5\20\1\0\3\20\1\62\10\20\1\0\1\20"+ - "\1\0\1\20\1\0\3\20\1\0\1\20\5\0\5\20"+ - "\1\0\7\20\1\52\4\20\1\0\1\20\1\0\1\20"+ - "\1\0\3\20\1\0\1\20\5\0\5\20\1\0\6\20"+ - "\1\60\5\20\1\0\1\20\1\0\1\20\1\0\3\20"+ - "\1\0\1\20\5\0\5\20\1\0\7\20\1\63\4\20"+ - "\1\0\1\20\1\0\1\20\1\0\3\20\1\0\1\20"+ - "\5\0\5\20\1\0\7\20\1\64\4\20\1\0\1\20"+ - "\1\0\1\20\1\0\3\20\1\0\1\20\5\0\5\20"+ - "\1\0\4\20\1\65\7\20\1\0\1\20\1\0\1\20"+ - "\1\0\3\20\1\0\1\20\5\0\5\20\1\0\1\66"+ - "\13\20\1\0\1\20\1\0\1\20\1\0\3\20\1\0"+ - "\1\20\5\0\5\20\1\0\1\67\13\20\1\0\1\20"+ - "\1\0\1\20\1\0\3\20\1\0\1\20\5\0\5\20"+ - "\1\0\12\20\1\70\1\20\1\0\1\20\1\0\1\20"+ - "\1\0\3\20\1\0\1\20\5\0\5\20\1\0\5\20"+ - "\1\71\6\20\1\0\1\20\1\0\1\20\1\0\3\20"+ - "\1\0\1\20\5\0\5\20\1\0\3\20\1\72\10\20"+ - "\1\0\1\20\1\0\1\20\1\0\3\20\1\0\1\20"+ - "\5\0\5\20\1\0\10\20\1\73\3\20\1\0\1\20"+ - "\1\0\1\20\1\0\3\20\1\0\1\20\5\0\5\20"+ - "\1\0\10\20\1\74\3\20\1\0\1\20\1\0\1\20"+ - "\1\0\3\20\1\0\1\20\5\0\5\20\1\0\1\20"+ - "\1\75\12\20\1\0\1\20\1\0\1\20\1\0\3\20"+ - "\1\0\1\20\5\0\5\20\1\0\3\20\1\76\10\20"+ - "\1\0\1\20\1\0\1\20\1\0\3\20\1\0\1\20"+ - "\5\0\5\20\1\0\1\75\13\20\1\0\1\20\1\0"+ - "\1\20\1\0\3\20\1\0\1\20\5\0\4\20\1\77"+ - "\1\0\13\20\1\100\1\0\1\20\1\0\1\77\1\0"+ - "\3\20\1\0\1\77\5\0\5\20\1\0\11\20\1\60"+ - "\2\20\1\0\1\20\1\0\1\20\1\0\3\20\1\0"+ - "\1\20\5\0\4\20\1\77\1\0\13\20\1\77\1\0"+ - "\1\20\1\0\1\77\1\0\3\20\1\0\1\77"; + "\1\0\1\71\13\20\2\0\1\20\1\0\1\20\1\0"+ + "\3\20\1\0\1\20\5\0\5\20\1\0\12\20\1\72"+ + "\1\20\2\0\1\20\1\0\1\20\1\0\3\20\1\0"+ + "\1\20\5\0\5\20\1\0\5\20\1\73\6\20\2\0"+ + "\1\20\1\0\1\20\1\0\3\20\1\0\1\20\5\0"+ + "\5\20\1\0\3\20\1\74\10\20\2\0\1\20\1\0"+ + "\1\20\1\0\3\20\1\0\1\20\5\0\5\20\1\0"+ + "\10\20\1\75\3\20\2\0\1\20\1\0\1\20\1\0"+ + "\3\20\1\0\1\20\5\0\5\20\1\0\10\20\1\76"+ + "\3\20\2\0\1\20\1\0\1\20\1\0\3\20\1\0"+ + "\1\20\5\0\5\20\1\0\1\20\1\77\12\20\2\0"+ + "\1\20\1\0\1\20\1\0\3\20\1\0\1\20\5\0"+ + "\5\20\1\0\3\20\1\100\10\20\2\0\1\20\1\0"+ + "\1\20\1\0\3\20\1\0\1\20\5\0\5\20\1\0"+ + "\1\77\13\20\2\0\1\20\1\0\1\20\1\0\3\20"+ + "\1\0\1\20\5\0\4\20\1\101\1\0\13\20\1\102"+ + "\1\103\1\0\1\20\1\0\1\101\1\0\3\20\1\0"+ + "\1\101\5\0\5\20\1\0\11\20\1\62\2\20\2\0"+ + "\1\20\1\0\1\20\1\0\3\20\1\0\1\20\5\0"+ + "\4\20\1\101\1\0\13\20\1\101\2\0\1\20\1\0"+ + "\1\101\1\0\3\20\1\0\1\101\11\0\1\104\21\0"+ + "\1\104\5\0\1\104\11\0\1\104\14\0\1\104\4\0"+ + "\1\104\5\0\1\104"; private static int [] zzUnpackTrans() { - int [] result = new int[1749]; + int [] result = new int[1904]; int offset = 0; offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); return result; @@ -325,11 +331,11 @@ public final class FlasmLexer extends DefaultJFlexLexer { private static final String ZZ_ATTRIBUTE_PACKED_0 = "\3\0\1\11\5\1\1\11\1\1\1\11\1\1\1\11"+ - "\12\1\1\11\1\0\2\11\2\1\1\0\7\1\1\11"+ - "\1\1\1\0\27\1"; + "\13\1\1\11\1\0\2\11\2\1\1\0\6\1\1\0"+ + "\1\1\1\11\1\1\1\0\27\1\1\0\1\1"; private static int [] zzUnpackAttribute() { - int [] result = new int[64]; + int [] result = new int[68]; int offset = 0; offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); return result; diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/GroovyLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/GroovyLexer.java index a9e7bdd5e..1fc8bef39 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/GroovyLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/GroovyLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -24,8 +24,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/groovy.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/groovy.flex */ public final class GroovyLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/JFlexLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/JFlexLexer.java index 09e445191..6cd179e1a 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/JFlexLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/JFlexLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -24,8 +24,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/jflex.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/jflex.flex */ public final class JFlexLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/JavaLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/JavaLexer.java index c7e88e751..5b069e973 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/JavaLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/JavaLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -24,8 +24,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/java.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/java.flex */ public final class JavaLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/JavaScriptLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/JavaScriptLexer.java index fd7104d83..ac63b3610 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/JavaScriptLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/JavaScriptLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -24,8 +24,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/javascript.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/javascript.flex */ public final class JavaScriptLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/LuaLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/LuaLexer.java index 71aa5f14d..80d19f38c 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/LuaLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/LuaLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -24,8 +24,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/lua.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/lua.flex */ public final class LuaLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/PropertiesLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/PropertiesLexer.java index 3fca3d192..10c5fa46a 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/PropertiesLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/PropertiesLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -24,8 +24,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/properties.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/properties.flex */ public final class PropertiesLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/PythonLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/PythonLexer.java index b4041d6c2..bd67c8ee3 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/PythonLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/PythonLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -24,8 +24,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/python.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/python.flex */ public final class PythonLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/RubyLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/RubyLexer.java index 1703c95b9..a24113aef 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/RubyLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/RubyLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -24,8 +24,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/ruby.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/ruby.flex */ public final class RubyLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/ScalaLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/ScalaLexer.java index 732c74c6f..8db584d34 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/ScalaLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/ScalaLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -23,8 +23,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/scala.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/scala.flex */ public final class ScalaLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/SqlLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/SqlLexer.java index 247543305..3d7447ce8 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/SqlLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/SqlLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -23,8 +23,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/sql.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/sql.flex */ public final class SqlLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/TALLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/TALLexer.java index 9418cc098..b735dcaa7 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/TALLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/TALLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -23,8 +23,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/tal.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/tal.flex */ public final class TALLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/XHTMLLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/XHTMLLexer.java index af0eb5b63..0d0233366 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/XHTMLLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/XHTMLLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -24,8 +24,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xhtml.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xhtml.flex */ public final class XHTMLLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/XPathLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/XPathLexer.java index c0032e185..b9572da41 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/XPathLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/XPathLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -26,8 +26,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xpath.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xpath.flex */ public final class XPathLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/XmlLexer.java b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/XmlLexer.java index 9a0f4d22b..75a4c66f2 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/XmlLexer.java +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/XmlLexer.java @@ -1,4 +1,4 @@ -/* The following code was generated by JFlex 1.4.3 on 21.7.10 18:14 */ +/* The following code was generated by JFlex 1.4.3 on 1.3.13 22:20 */ /* * Copyright 2008 Ayman Al-Sairafi ayman.alsairafi@gmail.com @@ -24,8 +24,8 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 21.7.10 18:14 from the specification file - * D:/Dokumenty/Programovani/JavaSE/JPSWFDec/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xml.flex + * on 1.3.13 22:20 from the specification file + * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/libsrc/jsyntaxpane/jsyntaxpane/src/main/jflex/jsyntaxpane/lexers/xml.flex */ public final class XmlLexer extends DefaultJFlexLexer { diff --git a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/maven-archiver/pom.properties b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/maven-archiver/pom.properties index a046ad8f3..1d4fa0bcb 100644 --- a/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/maven-archiver/pom.properties +++ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/maven-archiver/pom.properties @@ -1,5 +1,5 @@ #Generated by Maven -#Wed Jul 21 18:15:08 CEST 2010 +#Fri Mar 01 22:21:04 CET 2013 version=0.9.5 groupId=jsyntaxpane artifactId=jsyntaxpane diff --git a/trunk/nbproject/ide-file-targets.xml b/trunk/nbproject/ide-file-targets.xml index d3d321842..6c3becb55 100644 --- a/trunk/nbproject/ide-file-targets.xml +++ b/trunk/nbproject/ide-file-targets.xml @@ -12,7 +12,32 @@ - + + + + + + + + + Must set property 'run.class' + + + + + + + + + + + Must set property 'run.class' + + + + + + diff --git a/trunk/nbproject/project.xml b/trunk/nbproject/project.xml index 8408ee17e..8210e203e 100644 --- a/trunk/nbproject/project.xml +++ b/trunk/nbproject/project.xml @@ -56,6 +56,32 @@ debug-nb + + + run-selected-file-in-src + + run.class + src + \.java$ + java-name + + + + + + + + run-selected-file-in-test + + run.class + test + \.java$ + java-name + + + + + folder diff --git a/trunk/src/com/jpexs/decompiler/flash/SWF.java b/trunk/src/com/jpexs/decompiler/flash/SWF.java index 944217695..c4b098548 100644 --- a/trunk/src/com/jpexs/decompiler/flash/SWF.java +++ b/trunk/src/com/jpexs/decompiler/flash/SWF.java @@ -1162,7 +1162,7 @@ public class SWF { return null; } - private static void getVariables(ConstantPool constantPool, List localData, Stack stack, List output, ActionGraphSource code, int ip, int lastIp, HashMap variables, List functions, List visited) { + private static void getVariables(ConstantPool constantPool, List localData, Stack stack, List output, ActionGraphSource code, int ip, int lastIp, HashMap variables, List functions, List visited) { boolean debugMode = false; while ((ip > -1) && ip < code.size()) { if (visited.contains(ip)) { @@ -1263,7 +1263,7 @@ public class SWF { } private static void getVariables(HashMap variables, List functions, ActionGraphSource code, int addr) { - List localData = Helper.toList(new HashMap(), new HashMap(), new HashMap()); + List localData = Helper.toList(new HashMap(), new HashMap(), new HashMap()); try { getVariables(null, localData, new Stack(), new ArrayList(), code, code.adr2pos(addr), 0, variables, functions, new ArrayList()); } catch (Exception ex) { @@ -1275,9 +1275,7 @@ public class SWF { HashMap ret = new HashMap(); List actions = src.getActions(version); actionsMap.put(src, actions); - List ss = new ArrayList(); - ss.addAll(actions); - getVariables(variables, functions, new ActionGraphSource(ss, version, new HashMap(), new HashMap(), new HashMap()), 0); + getVariables(variables, functions, new ActionGraphSource(actions, version, new HashMap(), new HashMap(), new HashMap()), 0); return ret; } private HashMap> actionsMap = new HashMap>(); diff --git a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java index fedbea697..850c9b3a4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java +++ b/trunk/src/com/jpexs/decompiler/flash/SWFInputStream.java @@ -529,7 +529,7 @@ public class SWFInputStream extends InputStream { return readActionList(listeners, address, containerSWFOffset, rri, version, rri.getPos(), rri.getPos() + maxlen); } - private static void getConstantPool(List listeners, ConstantPool cpool, List localData, Stack stack, List output, ActionGraphSource code, int ip, int lastIp, List constantPools, List visited, int version, int endIp) { + private static void getConstantPool(List listeners, ConstantPool cpool, List localData, Stack stack, List output, ActionGraphSource code, int ip, int lastIp, List constantPools, List visited, int version, int endIp) { boolean debugMode = false; boolean deobfuscate = (Boolean) Configuration.getConfig("autoDeobfuscate", true); while (((endIp == -1) || (endIp > ip)) && (ip > -1) && ip < code.size()) { @@ -556,7 +556,7 @@ public class SWFInputStream extends InputStream { output2s.add(new ArrayList()); continue; } - List localData2 = Helper.toList(new HashMap(), new HashMap(), new HashMap()); + List localData2 = Helper.toList(new HashMap(), new HashMap(), new HashMap()); List output2 = new ArrayList(); output2s.add(output2); getConstantPool(listeners, cpool, localData2, new Stack(), output2, code, code.adr2pos(endAddr), lastIp, constantPools, visited, version, code.adr2pos(endAddr + size)); @@ -595,7 +595,7 @@ public class SWFInputStream extends InputStream { if (ins instanceof ActionJump) { add += " change:" + (((ActionJump) ins).getJumpOffset()); } - System.err.println("getConstantPool ip " + ip + ", addr " + Helper.formatAddress(((Action) ins).getAddress()) + ": " + ((Action) ins).getASMSource(new ArrayList(), new ArrayList(), Helper.toList(cpool), version, false) + add + " stack:" + Helper.stackToString(stack, Helper.toList(cpool))); + System.err.println("getConstantPool ip " + ip + ", addr " + Helper.formatAddress(((Action) ins).getAddress()) + ": " + ((Action) ins).getASMSource(new ArrayList(), new ArrayList(), cpool.constants, version, false) + add + " stack:" + Helper.stackToString(stack, Helper.toList(cpool))); if (ip == 116) { System.err.println("kok"); } @@ -693,7 +693,7 @@ public class SWFInputStream extends InputStream { public static List getConstantPool(List listeners, ActionGraphSource code, int addr, int version) { List ret = new ArrayList(); - List localData = Helper.toList(new HashMap(), new HashMap(), new HashMap()); + List localData = Helper.toList(new HashMap(), new HashMap(), new HashMap()); try { getConstantPool(listeners, null, localData, new Stack(), new ArrayList(), code, code.adr2pos(addr), 0, ret, new ArrayList(), version, -1); } catch (Exception ex) { @@ -715,7 +715,7 @@ public class SWFInputStream extends InputStream { Stack stack = new Stack(); - List localData = Helper.toList(new HashMap(), new HashMap(), new HashMap()); + List localData = Helper.toList(new HashMap(), new HashMap(), new HashMap()); SWFInputStream sis = new SWFInputStream(rri, version); @@ -737,7 +737,7 @@ public class SWFInputStream extends InputStream { } } } - List ret = new ArrayList(); + List ret = new ArrayList(); Action last = null; for (Action a : retdups) { if (a != last) { @@ -794,7 +794,7 @@ public class SWFInputStream extends InputStream { return reta; } - private static boolean readActionListAtPos(List listeners, List output, HashMap> containers, long address, long containerSWFOffset, boolean notCompileTime, boolean enableVariables, List localData, Stack stack, ConstantPool cpool, SWFInputStream sis, ReReadableInputStream rri, int ip, List ret, int startIp, int endip) throws IOException { + private static boolean readActionListAtPos(List listeners, List output, HashMap> containers, long address, long containerSWFOffset, boolean notCompileTime, boolean enableVariables, List localData, Stack stack, ConstantPool cpool, SWFInputStream sis, ReReadableInputStream rri, int ip, List ret, int startIp, int endip) throws IOException { boolean debugMode = false; boolean decideBranch = false; @@ -1047,7 +1047,7 @@ public class SWFInputStream extends InputStream { output2s.add(new ArrayList()); continue; } - List localData2 = Helper.toList(new HashMap(), new HashMap(), new HashMap()); + List localData2 = Helper.toList(new HashMap(), new HashMap(), new HashMap()); List output2 = new ArrayList(); readActionListAtPos(listeners, output2, containers, address, containerSWFOffset, notCompileTime, enableVariables, localData2, new Stack(), cpool, sis, rri, (int) endAddr, ret, startIp, (int) (endAddr + size)); output2s.add(output2); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java index 22cc27ff8..43d825a01 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/AVM2Code.java @@ -551,7 +551,7 @@ public class AVM2Code implements Serializable { public AVM2Code() { } - public Object execute(HashMap arguments, ConstantPool constants) { + public Object execute(HashMap arguments, ConstantPool constants) { int pos = 0; LocalDataArea lda = new LocalDataArea(); lda.localRegisters = arguments; @@ -830,7 +830,7 @@ public class AVM2Code implements Serializable { cacheActual = false; } - private static String innerStackToString(List stack) { + private static String innerStackToString(List stack) { String ret = ""; for (int d = 0; d < stack.size(); d++) { Object o = stack.get(d); @@ -940,7 +940,7 @@ public class AVM2Code implements Serializable { } Stack cstack = new Stack(); cstack.push("catched " + body.exceptions[g].getVarName(constants)); - List outcatch = toSource(cstack, new Stack(), abc, constants, method_info, body, pos, endpos).output; + List outcatch = toSource(cstack, new Stack(), abc, constants, method_info, body, pos, endpos).output; output.addAll(outcatch); newip = endpos + 1; } @@ -1597,7 +1597,7 @@ public class AVM2Code implements Serializable { public int removeTraps(ConstantPool constants, MethodBody body, ABC abc, int scriptIndex, int classIndex, boolean isStatic) { removeDeadCode(constants, body); - List localData = new ArrayList(); + List localData = new ArrayList(); localData.add((Boolean) isStatic); //isStatic localData.add((Integer) (classIndex)); //classIndex localData.add(new HashMap()); @@ -1922,8 +1922,8 @@ public class AVM2Code implements Serializable { } } - public void restoreControlFlow(int ip, HashMap> refs, int visited2[], HashMap appended) throws ConvertException { - List buf = new ArrayList(); + public void restoreControlFlow(int ip, HashMap> refs, int visited2[], HashMap> appended) throws ConvertException { + List buf = new ArrayList(); boolean cont = false; int continueip = 0; AVM2Instruction prev = null; @@ -1983,7 +1983,7 @@ public class AVM2Code implements Serializable { if ((newip < code.size()) && (refs.containsKey(newip) && refs.get(newip).size() == 1)) { if (!cont) { continueip = ip; - buf = new ArrayList(); + buf = new ArrayList(); appended.put(continueip, buf); } cont = true; @@ -2019,7 +2019,7 @@ public class AVM2Code implements Serializable { HashMap> refs; int visited2[] = new int[code.size()]; refs = visitCode(body); - HashMap appended = new HashMap(); + HashMap> appended = new HashMap>(); /*if (secondpass) { restoreControlFlow(code.size() - 1, refs, visited2, appended); } else*/ { @@ -2160,7 +2160,7 @@ public class AVM2Code implements Serializable { public boolean skipUsed = false; } - private static int removeTraps(boolean secondPass, boolean useVisited, List localData, Stack stack, List output, AVM2GraphSource code, int ip, int lastIp, HashMap visited, HashMap> visitedStates, HashMap decisions) { + private static int removeTraps(boolean secondPass, boolean useVisited, List localData, Stack stack, List output, AVM2GraphSource code, int ip, int lastIp, HashMap visited, HashMap> visitedStates, HashMap decisions) { boolean debugMode = false; int ret = 0; iploop: @@ -2339,7 +2339,7 @@ public class AVM2Code implements Serializable { return ret; } - public static int removeTraps(List localData, AVM2GraphSource code, int addr) { + public static int removeTraps(List localData, AVM2GraphSource code, int addr) { HashMap decisions = new HashMap(); removeTraps(false, false, localData, new Stack(), new ArrayList(), code, code.adr2pos(addr), 0, new HashMap(), new HashMap>(), decisions); localData.set(2, new HashMap()); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/LocalDataArea.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/LocalDataArea.java index 917d8710e..3e079a29a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/LocalDataArea.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/LocalDataArea.java @@ -23,5 +23,5 @@ public class LocalDataArea { public Stack operandStack = new Stack(); public Stack scopeStack = new Stack(); - public HashMap localRegisters = new HashMap(); + public HashMap localRegisters = new HashMap(); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java index 9260fcfd9..cd967a843 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2Graph.java @@ -109,7 +109,7 @@ public class AVM2Graph extends Graph { for (GraphPart head : g.heads) { populateParts(head, allParts); } - List localData = new ArrayList(); + List localData = new ArrayList(); localData.add((Boolean) isStatic); localData.add((Integer) classIndex); localData.add(localRegs); @@ -1147,7 +1147,7 @@ public class AVM2Graph extends Graph { }*/ @Override - protected List check(GraphSource srcCode, List localData, List allParts, Stack stack, GraphPart parent, GraphPart part, GraphPart stopPart, List loops, List output, HashMap> forFinalCommands) { + protected List check(GraphSource srcCode, List localData, List allParts, Stack stack, GraphPart parent, GraphPart part, GraphPart stopPart, List loops, List output, HashMap> forFinalCommands) { List ret = null; @@ -1268,7 +1268,7 @@ public class AVM2Graph extends Graph { } } stack.add(new ExceptionTreeItem(catchedExceptions.get(e))); - List localData2 = new ArrayList(); + List localData2 = new ArrayList(); localData2.addAll(localData); localData2.set(DATA_SCOPESTACK, new Stack()); catchedCommands.add(printGraph(new ArrayList(), localData2, stack, allParts, parent, npart, nepart, loops, forFinalCommands)); @@ -1492,7 +1492,7 @@ public class AVM2Graph extends Graph { } @Override - protected GraphPart checkPart(List localData, GraphPart next) { + protected GraphPart checkPart(List localData, GraphPart next) { List finallyJumps = (List) localData.get(DATA_FINALLYJUMPS); for (int f : finallyJumps) { if (next.start == f) { @@ -1563,8 +1563,8 @@ public class AVM2Graph extends Graph { } @Override - public List prepareBranchLocalData(List localData) { - List ret = new ArrayList(); + public List prepareBranchLocalData(List localData) { + List ret = new ArrayList(); ret.addAll(localData); Stack scopeStack = (Stack) ret.get(DATA_SCOPESTACK); Stack copyScopeStack = new Stack(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2GraphSource.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2GraphSource.java index 4c2618eca..8b6b02199 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2GraphSource.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/graph/AVM2GraphSource.java @@ -63,7 +63,7 @@ public class AVM2GraphSource extends GraphSource { } @Override - public List translatePart(GraphPart part, List localData, Stack stack, int start, int end) { + public List translatePart(GraphPart part, List localData, Stack stack, int start, int end) { List ret = new ArrayList(); ConvertOutput co = code.toSourceOutput(part, false, isStatic, scriptIndex, classIndex, localRegs, stack, (Stack) localData.get(AVM2Graph.DATA_SCOPESTACK), abc, abc.constants, abc.method_info, body, start, end, localRegNames, fullyQualifiedNames, new boolean[size()]); ret.addAll(co.output); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java index d423887ac..73cd8cf81 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java @@ -124,8 +124,8 @@ public class AVM2Instruction implements Serializable, GraphSourceItem { return ret; } - public List getParamsAsList(ConstantPool constants) { - List s = new ArrayList(); + public List getParamsAsList(ConstantPool constants) { + List s = new ArrayList(); for (int i = 0; i < definition.operands.length; i++) { switch (definition.operands[i]) { case AVM2Code.DAT_MULTINAME_INDEX: @@ -240,10 +240,10 @@ public class AVM2Instruction implements Serializable, GraphSourceItem { s += getParams(constants, fullyQualifiedNames) + getComment(); return s; } - public List replaceWith; + public List replaceWith; @Override - public void translate(List localData, Stack stack, List output) { + public void translate(List localData, Stack stack, List output) { definition.translate((Boolean) localData.get(0), (Integer) localData.get(13), (Integer) localData.get(1), diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java index c26b55675..42eb40861 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/InstructionDefinition.java @@ -68,7 +68,7 @@ public class InstructionDefinition implements Serializable { return s; } - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { throw new UnsupportedOperationException("Instruction " + instructionName + " not implemented"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java index 9afe2c01d..3f1c3258b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/AddIns.java @@ -35,7 +35,7 @@ public class AddIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object o1 = lda.operandStack.pop(); Object o2 = lda.operandStack.pop(); if ((o1 instanceof Long) && ((o2 instanceof Long))) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java index 7e5f70f95..8bbf21f9d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIIns.java @@ -35,7 +35,7 @@ public class DecrementIIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object obj = lda.operandStack.pop(); if (obj instanceof Long) { Long obj2 = ((Long) obj).longValue() - 1; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java index 77a98f406..7cb71cf3a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DecrementIns.java @@ -35,7 +35,7 @@ public class DecrementIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object obj = lda.operandStack.pop(); if (obj instanceof Long) { Long obj2 = ((Long) obj).longValue() - 1; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java index ef2692ec4..702d0ab10 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/DivideIns.java @@ -35,7 +35,7 @@ public class DivideIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object o2 = lda.operandStack.pop(); Object o1 = lda.operandStack.pop(); if ((o1 instanceof Long) && ((o2 instanceof Long))) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java index c5c642e4b..7eba2c645 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/ModuloIns.java @@ -35,7 +35,7 @@ public class ModuloIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object o1 = lda.operandStack.pop(); Object o2 = lda.operandStack.pop(); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java index 4454de4e6..55d1dd0f2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/arithmetic/MultiplyIns.java @@ -35,7 +35,7 @@ public class MultiplyIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object o1 = lda.operandStack.pop(); Object o2 = lda.operandStack.pop(); if ((o1 instanceof Long) && ((o2 instanceof Long))) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitAndIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitAndIns.java index a8594da75..99006b194 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitAndIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitAndIns.java @@ -35,7 +35,7 @@ public class BitAndIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Long value2 = (Long) lda.operandStack.pop(); Long value1 = (Long) lda.operandStack.pop(); Long value3 = value1 & value2; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java index dfee38199..384345bba 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitNotIns.java @@ -35,7 +35,7 @@ public class BitNotIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Long value = (Long) lda.operandStack.pop(); Long ret = new Long(-value.longValue()); lda.operandStack.push(ret); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitOrIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitOrIns.java index f5a9d9255..02a0e9397 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitOrIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitOrIns.java @@ -35,7 +35,7 @@ public class BitOrIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Long value2 = (Long) lda.operandStack.pop(); Long value1 = (Long) lda.operandStack.pop(); Long value3 = value1 | value2; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitXorIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitXorIns.java index 9ac67fb8c..1e1ca81f3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitXorIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/bitwise/BitXorIns.java @@ -35,7 +35,7 @@ public class BitXorIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Long value2 = (Long) lda.operandStack.pop(); Long value1 = (Long) lda.operandStack.pop(); Long value3 = value1 ^ value2; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/EqualsIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/EqualsIns.java index d961625ca..63e74c19f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/EqualsIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/comparsion/EqualsIns.java @@ -35,7 +35,7 @@ public class EqualsIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object obj1 = lda.operandStack.pop(); Object obj2 = lda.operandStack.pop(); Boolean res = obj1.equals(obj2); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java index 357e75d84..fc27452b5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructIns.java @@ -46,9 +46,9 @@ public class ConstructIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int argCount = (int) ((Long) arguments.get(0)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructPropIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructPropIns.java index 2dfb5316a..3f66dbe38 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructPropIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructPropIns.java @@ -39,10 +39,10 @@ public class ConstructPropIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int multinameIndex = (int) ((Long) arguments.get(0)).longValue(); int argCount = (int) ((Long) arguments.get(1)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); }*/ diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructSuperIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructSuperIns.java index 53dc95a58..72a861fd7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructSuperIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/construction/ConstructSuperIns.java @@ -37,9 +37,9 @@ public class ConstructSuperIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int argCount = (int) ((Long) arguments.get(0)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallIns.java index bcd1fa914..2f4921b4b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallIns.java @@ -37,9 +37,9 @@ public class CallIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int argCount = (int) ((Long) arguments.get(0)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallMethodIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallMethodIns.java index d829c0ea4..c4b931861 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallMethodIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallMethodIns.java @@ -37,10 +37,10 @@ public class CallMethodIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int methodIndex = (int) ((Long) arguments.get(0)).longValue(); //index of object's method int argCount = (int) ((Long) arguments.get(1)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropVoidIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropVoidIns.java index 16fb2b39f..8516ca03f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropVoidIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropVoidIns.java @@ -38,12 +38,12 @@ public class CallPropVoidIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { //same as callproperty /* int multinameIndex = (int) ((Long) arguments.get(0)).longValue(); int argCount = (int) ((Long) arguments.get(1)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropertyIns.java index 6312c6455..e3f0a6f1f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallPropertyIns.java @@ -38,10 +38,10 @@ public class CallPropertyIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int multinameIndex = (int) ((Long) arguments.get(0)).longValue(); int argCount = (int) ((Long) arguments.get(1)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallStaticIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallStaticIns.java index e0d037f67..4c94b145a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallStaticIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallStaticIns.java @@ -37,10 +37,10 @@ public class CallStaticIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int methodIndex = (int) ((Long) arguments.get(0)).longValue(); //index of method_info int argCount = (int) ((Long) arguments.get(1)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperIns.java index 649469250..9cbd912f4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperIns.java @@ -38,10 +38,10 @@ public class CallSuperIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int multinameIndex = (int) ((Long) arguments.get(0)).longValue(); int argCount = (int) ((Long) arguments.get(1)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperVoidIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperVoidIns.java index d44ca49f1..6e3219570 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperVoidIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/executing/CallSuperVoidIns.java @@ -38,10 +38,10 @@ public class CallSuperVoidIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { /*int multinameIndex = (int) ((Long) arguments.get(0)).longValue(); int argCount = (int) ((Long) arguments.get(1)).longValue(); - List passArguments = new ArrayList(); + List passArguments = new ArrayList(); for (int i = argCount - 1; i >= 0; i--) { passArguments.set(i, lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java index 6ee4e83f7..57f15ebf4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIIns.java @@ -38,7 +38,7 @@ public class DecLocalIIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int locRegIndex = (int) ((Long) arguments.get(0)).longValue(); Object obj = lda.localRegisters.get(locRegIndex); if (obj instanceof Long) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java index fdc858fd7..29641fe60 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/DecLocalIns.java @@ -38,7 +38,7 @@ public class DecLocalIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int locRegIndex = (int) ((Long) arguments.get(0)).longValue(); Object obj = lda.localRegisters.get(locRegIndex); if (obj instanceof Long) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal0Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal0Ins.java index 7cff61c68..d19b3d835 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal0Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal0Ins.java @@ -37,7 +37,7 @@ public class GetLocal0Ins extends InstructionDefinition implements GetLocalTypeI } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(lda.localRegisters.get(0)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal1Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal1Ins.java index b3866b335..6c2077fd7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal1Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal1Ins.java @@ -35,7 +35,7 @@ public class GetLocal1Ins extends InstructionDefinition implements GetLocalTypeI } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(lda.localRegisters.get(1)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal2Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal2Ins.java index 8b2f47d4a..3ed3c0b3b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal2Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal2Ins.java @@ -35,7 +35,7 @@ public class GetLocal2Ins extends InstructionDefinition implements GetLocalTypeI } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(lda.localRegisters.get(2)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal3Ins.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal3Ins.java index 6b557370d..a39b9e712 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal3Ins.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocal3Ins.java @@ -35,7 +35,7 @@ public class GetLocal3Ins extends InstructionDefinition implements GetLocalTypeI } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(lda.localRegisters.get(3)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalIns.java index 26a415f2b..973c76d91 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/localregs/GetLocalIns.java @@ -36,7 +36,7 @@ public class GetLocalIns extends InstructionDefinition implements GetLocalTypeIn } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(lda.localRegisters.get((int) (long) (Long) arguments.get(0))); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/DeletePropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/DeletePropertyIns.java index 1da87f7fd..7ae29ed5f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/DeletePropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/DeletePropertyIns.java @@ -38,7 +38,7 @@ public class DeletePropertyIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int multiIndex = (int) ((Long) arguments.get(0)).longValue(); //if multiname[multinameIndex] is runtime //pop(name) pop(ns) diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyIns.java index dfcd50003..5efd97e93 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyIns.java @@ -37,7 +37,7 @@ public class FindPropertyIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int multiIndex = (int) ((Long) arguments.get(0)).longValue(); //if is runtime //pop(name), pop(ns) diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyStrictIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyStrictIns.java index 95e97c7b8..b3e15a0e5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyStrictIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/FindPropertyStrictIns.java @@ -37,7 +37,7 @@ public class FindPropertyStrictIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int multiIndex = (int) ((Long) arguments.get(0)).longValue(); //if is runtime //pop(name), pop(ns) diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetDescendantsIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetDescendantsIns.java index c551ce75e..9e43c0cca 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetDescendantsIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetDescendantsIns.java @@ -37,7 +37,7 @@ public class GetDescendantsIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int multiIndex = (int) ((Long) arguments.get(0)).longValue(); //if is runtime //pop(name), pop(ns) diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalScopeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalScopeIns.java index 504cc7cca..f9fdaf2ad 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalScopeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/other/GetGlobalScopeIns.java @@ -36,7 +36,7 @@ public class GetGlobalScopeIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { throw new RuntimeException("getglobalscope not working"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java index 592ec7982..7086ccf81 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/DupIns.java @@ -35,7 +35,7 @@ public class DupIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object obj = lda.operandStack.pop(); lda.operandStack.push(obj); lda.operandStack.push(obj); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java index 464d45d6d..ba40c67a4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopIns.java @@ -36,7 +36,7 @@ public class PopIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.pop(); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopScopeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopScopeIns.java index 46962e732..e6222721b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopScopeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PopScopeIns.java @@ -37,7 +37,7 @@ public class PopScopeIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.scopeStack.pop(); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java index d83e1b192..d9317413e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushByteIns.java @@ -36,7 +36,7 @@ public class PushByteIns extends InstructionDefinition implements PushIntegerTyp } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(arguments.get(0)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushDoubleIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushDoubleIns.java index 177e05ebf..5c2eb12ba 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushDoubleIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushDoubleIns.java @@ -36,7 +36,7 @@ public class PushDoubleIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(arguments.get(0)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushFalseIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushFalseIns.java index 8c4ffac5a..bae43fb71 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushFalseIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushFalseIns.java @@ -35,7 +35,7 @@ public class PushFalseIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(Boolean.FALSE); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushIntIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushIntIns.java index a4ca9355b..c41395bd3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushIntIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushIntIns.java @@ -36,7 +36,7 @@ public class PushIntIns extends InstructionDefinition implements PushIntegerType } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(arguments.get(0)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushScopeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushScopeIns.java index faf43226d..2c846fab4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushScopeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushScopeIns.java @@ -34,7 +34,7 @@ public class PushScopeIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.scopeStack.push(lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushShortIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushShortIns.java index ded7601a2..84ad8ee13 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushShortIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushShortIns.java @@ -36,7 +36,7 @@ public class PushShortIns extends InstructionDefinition implements PushIntegerTy } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(arguments.get(0)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushStringIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushStringIns.java index 3cf714eaf..0da81ce27 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushStringIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushStringIns.java @@ -36,7 +36,7 @@ public class PushStringIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(arguments.get(0)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushTrueIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushTrueIns.java index 398a6ad49..e0d06eea2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushTrueIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushTrueIns.java @@ -35,7 +35,7 @@ public class PushTrueIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(Boolean.TRUE); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUIntIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUIntIns.java index 1981dd6d7..4f27a36f3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUIntIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/PushUIntIns.java @@ -36,7 +36,7 @@ public class PushUIntIns extends InstructionDefinition implements PushIntegerTyp } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { lda.operandStack.push(arguments.get(0)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/SwapIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/SwapIns.java index c2e7298a4..de70ac382 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/SwapIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/stack/SwapIns.java @@ -36,7 +36,7 @@ public class SwapIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object obj1 = lda.operandStack.pop(); Object obj2 = lda.operandStack.pop(); lda.operandStack.push(obj1); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ApplyTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ApplyTypeIns.java index 0872fef23..57c627dbd 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ApplyTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ApplyTypeIns.java @@ -34,9 +34,9 @@ public class ApplyTypeIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int argCount = (int) ((Long) arguments.get(0)).longValue(); - List params = new ArrayList(); + List params = new ArrayList(); for (int i = 0; i < argCount; i++) { params.add(lda.operandStack.pop()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeIns.java index a402f83d6..f90543e33 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeIns.java @@ -37,7 +37,7 @@ public class AsTypeIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Long typeIndex = (Long) arguments.get(0); Object obj = lda.operandStack.pop(); //if multiname[typeIndex]==obj diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeLateIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeLateIns.java index f728e8c8c..fb5d94d81 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeLateIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/AsTypeLateIns.java @@ -35,7 +35,7 @@ public class AsTypeLateIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object objClass = lda.operandStack.pop(); Object obj = lda.operandStack.pop(); //if obj.class=objClass diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceAIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceAIns.java index 16f4890ba..657b0e532 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceAIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceAIns.java @@ -39,7 +39,7 @@ public class CoerceAIns extends InstructionDefinition implements CoerceOrConvert } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { //coerce any type } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceIns.java index 6496442dc..101f6b441 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceIns.java @@ -36,7 +36,7 @@ public class CoerceIns extends InstructionDefinition implements CoerceOrConvertT } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int multinameIndex = (int) ((Long) arguments.get(0)).longValue(); //push and pop coerced value to specified type } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceSIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceSIns.java index 386072cf2..18b066366 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceSIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/CoerceSIns.java @@ -35,7 +35,7 @@ public class CoerceSIns extends InstructionDefinition implements CoerceOrConvert } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object obj = lda.operandStack.pop(); lda.operandStack.push(obj.toString()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertBIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertBIns.java index aaee52bf8..d31cb3300 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertBIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertBIns.java @@ -35,7 +35,7 @@ public class ConvertBIns extends InstructionDefinition implements CoerceOrConver } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object value = lda.operandStack.pop(); boolean bval; if (value instanceof Boolean) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertDIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertDIns.java index 84e9a80d4..d9d91de48 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertDIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertDIns.java @@ -35,7 +35,7 @@ public class ConvertDIns extends InstructionDefinition implements CoerceOrConver } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object value = lda.operandStack.pop(); double ret; if (value == null) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertIIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertIIns.java index 616c39fd6..ec2b4cd37 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertIIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertIIns.java @@ -35,7 +35,7 @@ public class ConvertIIns extends InstructionDefinition implements CoerceOrConver } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object value = lda.operandStack.pop(); long ret; if (value == null) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertOIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertOIns.java index 8e7bf682c..75c678bce 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertOIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertOIns.java @@ -35,7 +35,7 @@ public class ConvertOIns extends InstructionDefinition implements CoerceOrConver } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { //throw if pop is not object } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertSIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertSIns.java index 638ebd571..36cd984b8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertSIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertSIns.java @@ -35,7 +35,7 @@ public class ConvertSIns extends InstructionDefinition implements CoerceOrConver } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { Object obj = lda.operandStack.pop(); lda.operandStack.push(obj.toString()); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertUIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertUIns.java index 34a9e3e7e..2bc85efed 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertUIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/types/ConvertUIns.java @@ -35,7 +35,7 @@ public class ConvertUIns extends InstructionDefinition implements CoerceOrConver } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { throw new UnsupportedOperationException("Cannot convert to uint "); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/CheckFilterIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/CheckFilterIns.java index fbf6c29bb..be738686e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/CheckFilterIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/CheckFilterIns.java @@ -35,7 +35,7 @@ public class CheckFilterIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { //if pop() is not XML|XMLList throw } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSIns.java index f4efb98f6..fb849f241 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSIns.java @@ -38,7 +38,7 @@ public class DXNSIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { int strIndex = (int) ((Long) arguments.get(0)).longValue(); String s = constants.constant_string[strIndex]; System.out.println("Set default XML space " + s); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSLateIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSLateIns.java index 5296f4fba..75f82dd42 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSLateIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/DXNSLateIns.java @@ -35,7 +35,7 @@ public class DXNSLateIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { String s = lda.operandStack.pop().toString(); System.out.println("Set default XML space " + s); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXAttrIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXAttrIns.java index 681026663..878c7e662 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXAttrIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXAttrIns.java @@ -35,7 +35,7 @@ public class EscXAttrIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { String s = lda.operandStack.pop().toString(); //escape lda.operandStack.push(s); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXElemIns.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXElemIns.java index abd84af9c..4e7542e11 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXElemIns.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/instructions/xml/EscXElemIns.java @@ -35,7 +35,7 @@ public class EscXElemIns extends InstructionDefinition { } @Override - public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { + public void execute(LocalDataArea lda, ConstantPool constants, List arguments) { String s = lda.operandStack.pop().toString(); //escape lda.operandStack.push(s); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java index dd2ee2ada..abfe54158 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/TreeItem.java @@ -35,7 +35,7 @@ public abstract class TreeItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { return toString((ConstantPool) localData.get(0), (HashMap) localData.get(1), (List) localData.get(2)); } diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForEachInTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForEachInTreeItem.java index 4fff91621..e0d8f9c94 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForEachInTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForEachInTreeItem.java @@ -65,7 +65,7 @@ public class ForEachInTreeItem extends LoopItem implements Block { } @Override - public String toString(List localData) { + public String toString(List localData) { String ret = ""; ret += "loop" + loop.id + ":\r\n"; ret += hilight("for each (") + expression.toString(localData) + ")\r\n{\r\n"; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForInTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForInTreeItem.java index 4f02a0cfd..42732fef7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForInTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/clauses/ForInTreeItem.java @@ -65,7 +65,7 @@ public class ForInTreeItem extends LoopItem implements Block { } @Override - public String toString(List localData) { + public String toString(List localData) { String ret = ""; ret += "loop" + loop.id + ":\r\n"; ret += hilight("for (") + expression.toString(localData) + hilight(")") + "\r\n{\r\n"; diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AddTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AddTreeItem.java index 404ebbc77..be6a4c687 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AddTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/avm2/treemodel/operations/AddTreeItem.java @@ -28,7 +28,7 @@ public class AddTreeItem extends BinaryOpItem { } @Override - public String toString(List localData) { + public String toString(List localData) { if (rightSide.precedence >= precedence) { String ret = ""; if (leftSide.precedence > precedence) { diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/ASMSourceEditorPane.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ASMSourceEditorPane.java index 5bd91405b..26645d7f2 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/ASMSourceEditorPane.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/ASMSourceEditorPane.java @@ -115,7 +115,7 @@ public class ASMSourceEditorPane extends LineMarkedEditorPane implements CaretLi } public void exec() { - HashMap args = new HashMap(); + HashMap args = new HashMap(); args.put(0, new Object()); //object "this" args.put(1, new Long(466561)); //param1 Object o = abc.bodies[bodyIndex].code.execute(args, abc.constants); diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java index dc4dec217..cccadf5c0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java @@ -71,7 +71,7 @@ public class TraitClass extends Trait implements TraitWithSlot { return "Class " + abc.constants.constant_multiname[name_index].toString(abc.constants, fullyQualifiedNames) + " slot=" + slot_id + " class_info=" + class_info + " metadata=" + Helper.intArrToString(metadata); } - private boolean parseUsagesFromNS(List abcTags, ABC abc, List imports, List uses, int namespace_index, String ignorePackage, String name) { + private boolean parseUsagesFromNS(List abcTags, ABC abc, List imports, List uses, int namespace_index, String ignorePackage, String name) { Namespace ns = abc.constants.constant_namespace[namespace_index]; if (name.equals("")) { name = "*"; @@ -116,7 +116,7 @@ public class TraitClass extends Trait implements TraitWithSlot { return false; } - private void parseImportsUsagesFromNS(List abcTags, ABC abc, List imports, List uses, int namespace_index, String ignorePackage, String name) { + private void parseImportsUsagesFromNS(List abcTags, ABC abc, List imports, List uses, int namespace_index, String ignorePackage, String name) { Namespace ns = abc.constants.constant_namespace[namespace_index]; if (name.equals("")) { name = "*"; @@ -269,7 +269,7 @@ public class TraitClass extends Trait implements TraitWithSlot { } } - private List getImportsUsages(List abcTags, ABC abc, List imports, List uses, List fullyQualifiedNames) { + private List getImportsUsages(List abcTags, ABC abc, List imports, List uses, List fullyQualifiedNames) { //constructor diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java index e1f0c14df..4a0ba01b6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java +++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitSlotConst.java @@ -21,7 +21,6 @@ import com.jpexs.decompiler.flash.abc.avm2.ConstantPool; import com.jpexs.decompiler.flash.abc.types.Multiname; import com.jpexs.decompiler.flash.abc.types.Namespace; import com.jpexs.decompiler.flash.abc.types.ValueKind; -import static com.jpexs.decompiler.flash.abc.types.traits.Trait.TRAIT_CONST; import com.jpexs.decompiler.flash.graph.Graph; import com.jpexs.decompiler.flash.graph.GraphTargetItem; import com.jpexs.decompiler.flash.helpers.Helper; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/Action.java b/trunk/src/com/jpexs/decompiler/flash/action/Action.java index 9698a0cda..ca34e987a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/Action.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/Action.java @@ -379,19 +379,13 @@ public class Action implements GraphSourceItem { * @param hex Add hexadecimal? * @return ASM source as String */ - public static String actionsToString(List listeners, long address, List list, List importantOffsets, List constantPool, int version, boolean hex, long swfPos) { + public static String actionsToString(List listeners, long address, List list, List importantOffsets, List constantPool, int version, boolean hex, long swfPos) { long offset; if (importantOffsets == null) { //setActionsAddresses(list, 0, version); importantOffsets = getActionsAllRefs(list, version); } - List srcList = new ArrayList(); - for (Object o : list) { - if (o instanceof Action) { - srcList.add((Action) o); - } - } - List cps = SWFInputStream.getConstantPool(new ArrayList(), new ActionGraphSource(srcList, version, new HashMap(), new HashMap(), new HashMap()), 0, version); + List cps = SWFInputStream.getConstantPool(new ArrayList(), new ActionGraphSource(list, version, new HashMap(), new HashMap(), new HashMap()), 0, version); if (!cps.isEmpty()) { setConstantPool(list, cps.get(cps.size() - 1)); } @@ -401,9 +395,9 @@ public class Action implements GraphSourceItem { int pos = -1; boolean lastPush = false; StringBuilder ret = new StringBuilder(); - for (GraphSourceItem s : srcList) { + for (GraphSourceItem s : list) { for (int i = 0; i < listeners.size(); i++) { - listeners.get(i).progress("toString", pos + 2, srcList.size()); + listeners.get(i).progress("toString", pos + 2, list.size()); } Action a = null; if (s instanceof Action) { @@ -552,7 +546,7 @@ public class Action implements GraphSourceItem { * @param hex Add hexadecimal * @return String of P-code source */ - public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { return toString(); } @@ -669,7 +663,7 @@ public class Action implements GraphSourceItem { } @Override - public void translate(List localData, Stack stack, List output) { + public void translate(List localData, Stack stack, List output) { translate(stack, output, (HashMap) localData.get(0), (HashMap) localData.get(1), (HashMap) localData.get(2)); } @@ -730,17 +724,11 @@ public class Action implements GraphSourceItem { logger.fine(s); } - public static List actionsPartToTree(HashMap registerNames, HashMap variables, HashMap functions, Stack stack, List src, int start, int end, int version) { - List actions = new ArrayList(); - for (GraphSourceItem s : src) { - if (s instanceof Action) { - actions.add((Action) s); - } - } + public static List actionsPartToTree(HashMap registerNames, HashMap variables, HashMap functions, Stack stack, List actions, int start, int end, int version) { if (start < actions.size() && (end > 0) && (start > 0)) { log("Entering " + start + "-" + end + (actions.size() > 0 ? (" (" + actions.get(start).toString() + " - " + actions.get(end == actions.size() ? end - 1 : end) + ")") : "")); } - List localData = new ArrayList(); + List localData = new ArrayList(); localData.add(registerNames); localData.add(variables); localData.add(functions); @@ -807,7 +795,7 @@ public class Action implements GraphSourceItem { outs.add(new ArrayList()); continue; } - List out = ActionGraph.translateViaGraph(cnt.getRegNames(), variables, functions, src.subList(adr2ip(actions, endAddr, version), adr2ip(actions, endAddr + size, version)), version); + List out = ActionGraph.translateViaGraph(cnt.getRegNames(), variables, functions, actions.subList(adr2ip(actions, endAddr, version), adr2ip(actions, endAddr + size, version)), version); outs.add(out); endAddr += size; } @@ -1251,7 +1239,7 @@ public class Action implements GraphSourceItem { return ret; } - public static void setConstantPool(List actions, ConstantPool cpool) { + public static void setConstantPool(List actions, ConstantPool cpool) { for (GraphSourceItem a : actions) { if (a instanceof ActionPush) { if (cpool != null) { @@ -1271,7 +1259,7 @@ public class Action implements GraphSourceItem { } } - public String getASMSourceReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSourceReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { return getASMSource(container, knownAddreses, constantPool, version, hex); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java index 635eec2ae..5b240c9bc 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraph.java @@ -53,7 +53,7 @@ import java.util.Stack; */ public class ActionGraph extends Graph { - public ActionGraph(List code, HashMap registerNames, HashMap variables, HashMap functions, int version) { + public ActionGraph(List code, HashMap registerNames, HashMap variables, HashMap functions, int version) { super(new ActionGraphSource(code, version, registerNames, variables, functions), new ArrayList()); //this.version = version; /*heads = makeGraph(code, new ArrayList()); @@ -63,10 +63,10 @@ public class ActionGraph extends Graph { }*/ } - public static List translateViaGraph(HashMap registerNames, HashMap variables, HashMap functions, List code, int version) { + public static List translateViaGraph(HashMap registerNames, HashMap variables, HashMap functions, List code, int version) { ActionGraph g = new ActionGraph(code, registerNames, variables, functions, version); - List localData = new ArrayList(); + List localData = new ArrayList(); localData.add(registerNames); return g.translate(localData); } @@ -124,7 +124,7 @@ public class ActionGraph extends Graph { } @Override - protected List check(GraphSource code, List localData, List allParts, Stack stack, GraphPart parent, GraphPart part, GraphPart stopPart, List loops, List output, HashMap> forFinalCommands) { + protected List check(GraphSource code, List localData, List allParts, Stack stack, GraphPart parent, GraphPart part, GraphPart stopPart, List loops, List output, HashMap> forFinalCommands) { if (!output.isEmpty()) { if (output.get(output.size() - 1) instanceof StoreRegisterTreeItem) { StoreRegisterTreeItem str = (StoreRegisterTreeItem) output.get(output.size() - 1); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java index 55b9abb53..30bb66676 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/ActionGraphSource.java @@ -18,17 +18,17 @@ import java.util.logging.Logger; */ public class ActionGraphSource extends GraphSource { - private List actions; + private List actions; public int version; private HashMap registerNames; private HashMap variables; private HashMap functions; - public List getActions() { + public List getActions() { return actions; } - public ActionGraphSource(List actions, int version, HashMap registerNames, HashMap variables, HashMap functions) { + public ActionGraphSource(List actions, int version, HashMap registerNames, HashMap variables, HashMap functions) { this.actions = actions; this.version = version; this.registerNames = registerNames; @@ -56,7 +56,7 @@ public class ActionGraphSource extends GraphSource { } @Override - public List translatePart(GraphPart part, List localData, Stack stack, int start, int end) { + public List translatePart(GraphPart part, List localData, Stack stack, int start, int end) { return (Action.actionsPartToTree(registerNames, variables, functions, stack, actions, start, end, version)); } private List posCache = null; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java index a78ff9cae..c7c151131 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptParser.java @@ -19,23 +19,6 @@ package com.jpexs.decompiler.flash.action.parser.script; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.action.parser.ParseException; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_BITAND; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_BITOR; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_DIVIDE; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_MINUS; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_MODULO; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_MULTIPLY; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_PLUS; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_SHIFT_LEFT; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_SHIFT_RIGHT; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_USHIFT_RIGHT; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.ASSIGN_XOR; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.DECREMENT; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.DO; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.INCREMENT; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.PARENT_OPEN; -import static com.jpexs.decompiler.flash.action.parser.script.SymbolType.SWITCH; import com.jpexs.decompiler.flash.action.swf3.ActionNextFrame; import com.jpexs.decompiler.flash.action.swf3.ActionPlay; import com.jpexs.decompiler.flash.action.swf3.ActionPrevFrame; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java index 03ca5aa5a..c90d12b15 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionIf.java @@ -82,7 +82,7 @@ public class ActionIf extends Action { } @Override - public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { String ofsStr = Helper.formatAddress(getAddress() + getBytes(version).length + offset); return "If loc" + ofsStr + (compileTime ? " ;compileTime" : ""); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java index a2900d3d4..683939d03 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionJump.java @@ -81,7 +81,7 @@ public class ActionJump extends Action { } @Override - public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { String ofsStr = Helper.formatAddress(getAddress() + getBytes(version).length + offset); return "Jump loc" + ofsStr; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java index 3cbe20678..bcc788cae 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf4/ActionPush.java @@ -199,7 +199,7 @@ public class ActionPush extends Action { } @Override - public String getASMSourceReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSourceReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { if (replacement == null || replacement.size() < values.size()) { return toString(); } @@ -210,7 +210,7 @@ public class ActionPush extends Action { return ts; } - public String paramsToStringReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String paramsToStringReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { if (replacement == null || replacement.size() < values.size()) { return paramsToString(); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java index 6ab6b9973..2af65c968 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionDefineFunction.java @@ -156,7 +156,7 @@ public class ActionDefineFunction extends Action implements GraphSourceItemConta } @Override - public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { String paramStr = ""; for (int i = 0; i < paramNames.size(); i++) { paramStr += "\"" + Helper.escapeString(paramNames.get(i)) + "\""; @@ -167,7 +167,7 @@ public class ActionDefineFunction extends Action implements GraphSourceItemConta } @Override - public String getASMSourceReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSourceReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { List oldParamNames = paramNames; if (replacedParamNames != null) { paramNames = replacedParamNames; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java index f5933e3e8..5f0410e78 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf5/ActionWith.java @@ -86,7 +86,7 @@ public class ActionWith extends Action implements GraphSourceItemContainer { } @Override - public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { return "With {"; // + "\r\n" + Action.actionsToString(getAddress() + 2, getItems(container), knownAddreses, constantPool, version, hex, containerSWFOffset + getAddress() + 2) + "}"; } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java index 6a55408b1..f08019fc9 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionDefineFunction2.java @@ -234,7 +234,7 @@ public class ActionDefineFunction2 extends Action implements GraphSourceItemCont } @Override - public String getASMSourceReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSourceReplaced(List container, List knownAddreses, List constantPool, int version, boolean hex) { List oldParamNames = paramNames; if (replacedParamNames != null) { paramNames = replacedParamNames; @@ -251,7 +251,7 @@ public class ActionDefineFunction2 extends Action implements GraphSourceItemCont } @Override - public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { String paramStr = ""; for (int i = 0; i < paramNames.size(); i++) { paramStr += paramRegisters.get(i) + " \"" + Helper.escapeString(paramNames.get(i)) + "\""; diff --git a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java index dbddf217c..55d19cbc7 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/swf7/ActionTry.java @@ -153,7 +153,7 @@ public class ActionTry extends Action implements GraphSourceItemContainer { } @Override - public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { + public String getASMSource(List container, List knownAddreses, List constantPool, int version, boolean hex) { String ret = ""; ret += "Try "; if (catchBlockFlag) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java index f2f41d3eb..b0513cff0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/DirectValueTreeItem.java @@ -124,7 +124,7 @@ public class DirectValueTreeItem extends TreeItem { } @Override - public String toStringNoQuotes(List localData) { + public String toStringNoQuotes(List localData) { if (value instanceof Double) { if (Double.compare((double) (Double) value, 0) == 0) { return hilight("0"); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ExtendsTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ExtendsTreeItem.java index d63596676..3b4984d30 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ExtendsTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/ExtendsTreeItem.java @@ -35,7 +35,7 @@ public class ExtendsTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { - List localData = new ArrayList(); + List localData = new ArrayList(); localData.add(constants); return subclass.toString(localData) + hilight(" extends ") + stripQuotes(superclass, constants); } diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetMemberTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetMemberTreeItem.java index 28ff54cbe..745cc7475 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetMemberTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetMemberTreeItem.java @@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.action.treemodel; import com.jpexs.decompiler.flash.graph.GraphPart; import com.jpexs.decompiler.flash.graph.GraphSourceItem; import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import static com.jpexs.decompiler.flash.graph.GraphTargetItem.PRECEDENCE_ASSIGMENT; import java.util.List; public class SetMemberTreeItem extends TreeItem implements SetTypeTreeItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetPropertyTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetPropertyTreeItem.java index 656c35853..c4300454a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetPropertyTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetPropertyTreeItem.java @@ -20,7 +20,6 @@ import com.jpexs.decompiler.flash.action.Action; import com.jpexs.decompiler.flash.graph.GraphPart; import com.jpexs.decompiler.flash.graph.GraphSourceItem; import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import static com.jpexs.decompiler.flash.graph.GraphTargetItem.PRECEDENCE_ASSIGMENT; import java.util.List; public class SetPropertyTreeItem extends TreeItem implements SetTypeTreeItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetVariableTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetVariableTreeItem.java index b0cdfaed6..9730a64f3 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetVariableTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/SetVariableTreeItem.java @@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.action.treemodel; import com.jpexs.decompiler.flash.graph.GraphPart; import com.jpexs.decompiler.flash.graph.GraphSourceItem; import com.jpexs.decompiler.flash.graph.GraphTargetItem; -import static com.jpexs.decompiler.flash.graph.GraphTargetItem.PRECEDENCE_ASSIGMENT; import java.util.List; public class SetVariableTreeItem extends TreeItem implements SetTypeTreeItem { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TreeItem.java index 6e9a9330f..ddb10f312 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/TreeItem.java @@ -60,7 +60,7 @@ public abstract class TreeItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { if (localData.isEmpty()) { ConstantPool c = null; return toString(c); diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TryTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TryTreeItem.java index 4627101ca..5dbfdbfbe 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TryTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/TryTreeItem.java @@ -52,7 +52,7 @@ public class TryTreeItem extends TreeItem implements Block { public String toString(ConstantPool constants) { String ret = ""; ret += "try\r\n{\r\n"; - List localData = new ArrayList(); + List localData = new ArrayList(); localData.add(constants); for (GraphTargetItem ti : tryCommands) { if (!ti.isEmpty()) { diff --git a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/WithTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/WithTreeItem.java index fb3db8fe9..caead584c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/WithTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/action/treemodel/clauses/WithTreeItem.java @@ -43,7 +43,7 @@ public class WithTreeItem extends TreeItem { @Override public String toString(ConstantPool constants) { String ret; - List localData = new ArrayList(); + List localData = new ArrayList(); localData.add(constants); ret = hilight("with(") + scope.toString(localData) + hilight(")\r\n{\r\n"); for (GraphTargetItem ti : items) { diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/BinaryOpItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/BinaryOpItem.java index ab506abd5..b937d9359 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/BinaryOpItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/BinaryOpItem.java @@ -41,7 +41,7 @@ public abstract class BinaryOpItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { String ret = ""; if (leftSide.getPrecedence() > precedence) { ret += "(" + leftSide.toString(localData) + ")"; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/BreakItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/BreakItem.java index e61904a90..8ed3e4621 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/BreakItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/BreakItem.java @@ -16,7 +16,7 @@ public class BreakItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { return hilight("break") + " " + "loop" + loopId; } } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/ContinueItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/ContinueItem.java index a3cc3d908..02dc4c6ba 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/ContinueItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/ContinueItem.java @@ -16,7 +16,7 @@ public class ContinueItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { return hilight("continue") + " " + "loop" + loopId; } } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/DoWhileItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/DoWhileItem.java index 5c0b96e46..05e3ecb7f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/DoWhileItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/DoWhileItem.java @@ -43,7 +43,7 @@ public class DoWhileItem extends LoopItem implements Block { } @Override - public String toString(List localData) { + public String toString(List localData) { String ret = ""; ret += "loop" + loop.id + ":\r\n"; ret += hilight("do\r\n{") + "\r\n"; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/DuplicateItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/DuplicateItem.java index 550e07739..f5ef95a88 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/DuplicateItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/DuplicateItem.java @@ -40,7 +40,7 @@ public class DuplicateItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { return value.toString(localData); } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/ForTreeItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/ForTreeItem.java index 8e87262bb..3a1576145 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/ForTreeItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/ForTreeItem.java @@ -51,7 +51,7 @@ public class ForTreeItem extends LoopItem implements Block { } @Override - public String toString(List localData) { + public String toString(List localData) { String ret = ""; ret += "loop" + loop.id + ":\r\n"; ret += hilight("for("); diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java index 713468410..cac2d3eec 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/Graph.java @@ -297,12 +297,12 @@ public class Graph { return part; } - public static List translateViaGraph(List localData, String path, GraphSource code, List alternateEntries) { + public static List translateViaGraph(List localData, String path, GraphSource code, List alternateEntries) { Graph g = new Graph(code, alternateEntries); return g.translate(localData); } - public List translate(List localData) { + public List translate(List localData) { List allParts = new ArrayList(); for (GraphPart head : heads) { populateParts(head, allParts); @@ -429,21 +429,21 @@ public class Graph { return false; } - protected List check(GraphSource code, List localData, List allParts, Stack stack, GraphPart parent, GraphPart part, GraphPart stopPart, List loops, List output, HashMap> forFinalCommands) { + protected List check(GraphSource code, List localData, List allParts, Stack stack, GraphPart parent, GraphPart part, GraphPart stopPart, List loops, List output, HashMap> forFinalCommands) { return null; } - protected GraphPart checkPart(List localData, GraphPart part) { + protected GraphPart checkPart(List localData, GraphPart part) { return part; } - protected GraphTargetItem translatePartGetStack(List localData, GraphPart part, Stack stack) { + protected GraphTargetItem translatePartGetStack(List localData, GraphPart part, Stack stack) { stack = (Stack) stack.clone(); translatePart(localData, part, stack); return stack.pop(); } - protected List translatePart(List localData, GraphPart part, Stack stack) { + protected List translatePart(List localData, GraphPart part, Stack stack) { List sub = part.getSubParts(); List ret = new ArrayList(); int end = 0; @@ -478,7 +478,7 @@ public class Graph { items.add(new MarkItem("finish")); } - protected List printGraph(List visited, List localData, Stack stack, List allParts, GraphPart parent, GraphPart part, GraphPart stopPart, List loops, HashMap> forFinalCommands) { + protected List printGraph(List visited, List localData, Stack stack, List allParts, GraphPart parent, GraphPart part, GraphPart stopPart, List loops, HashMap> forFinalCommands) { if (visited.contains(part)) { //return new ArrayList(); } else { @@ -1381,7 +1381,7 @@ public class Graph { */ public static String graphToString(List tree, Object... localData) { StringBuilder ret = new StringBuilder(); - List localDataList = new ArrayList(); + List localDataList = new ArrayList(); for (Object o : localData) { localDataList.add(o); } @@ -1478,7 +1478,7 @@ public class Graph { return ret.toString(); } - public List prepareBranchLocalData(List localData) { + public List prepareBranchLocalData(List localData) { return localData; } } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSource.java b/trunk/src/com/jpexs/decompiler/flash/graph/GraphSource.java index 16c581f3b..02b1a3024 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSource.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/GraphSource.java @@ -18,7 +18,7 @@ public abstract class GraphSource { public abstract boolean isEmpty(); - public abstract List translatePart(GraphPart part, List localData, Stack stack, int start, int end); + public abstract List translatePart(GraphPart part, List localData, Stack stack, int start, int end); private void visitCode(int ip, int lastIp, HashMap> refs, int endIp) { boolean debugMode = false; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItem.java index de8d456b1..913c9bac8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/GraphSourceItem.java @@ -9,7 +9,7 @@ import java.util.Stack; */ public interface GraphSourceItem { - public void translate(List localData, Stack stack, List output); + public void translate(List localData, Stack stack, List output); public boolean isJump(); diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/GraphTargetItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/GraphTargetItem.java index 7423442c9..56d107471 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/GraphTargetItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/GraphTargetItem.java @@ -64,12 +64,12 @@ public abstract class GraphTargetItem { return Highlighting.hilighOffset(str, src.getOffset()); } - public String toStringSemicoloned(List localData) { + public String toStringSemicoloned(List localData) { return toString(localData) + (needsSemicolon() ? ";" : ""); } public String toStringSemicoloned(Object... localData) { - List localData2 = new ArrayList(); + List localData2 = new ArrayList(); for (Object o : localData) { localData2.add(o); } @@ -85,10 +85,10 @@ public abstract class GraphTargetItem { return this.getClass().getName(); } - public abstract String toString(List localData); + public abstract String toString(List localData); public String toString(Object... localData) { - List localData2 = new ArrayList(); + List localData2 = new ArrayList(); for (Object o : localData) { localData2.add(o); } @@ -119,12 +119,12 @@ public abstract class GraphTargetItem { return Double.compare(toNumber(), 0.0) != 0; } - public String toStringNoQuotes(List localData) { + public String toStringNoQuotes(List localData) { return toString(localData); } public String toStringNoQuotes(Object... localData) { - List localData2 = new ArrayList(); + List localData2 = new ArrayList(); for (Object o : localData) { localData2.add(o); } @@ -144,7 +144,7 @@ public abstract class GraphTargetItem { } public String toStringNL(Object... localData) { - List localData2 = new ArrayList(); + List localData2 = new ArrayList(); for (Object o : localData) { localData2.add(o); } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/IfItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/IfItem.java index a41697983..881a17012 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/IfItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/IfItem.java @@ -46,7 +46,7 @@ public class IfItem extends GraphTargetItem implements Block { } @Override - public String toString(List localData) { + public String toString(List localData) { String ret; ret = hilight("if(") + expression.toString(localData) + hilight(")") + "\r\n{\r\n"; for (GraphTargetItem ti : onTrue) { diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/MarkItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/MarkItem.java index 16c5921a3..87fb369c6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/MarkItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/MarkItem.java @@ -32,7 +32,7 @@ public class MarkItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { return "//decompiler mark:" + mark; } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/ScriptEndItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/ScriptEndItem.java index a316d875b..8ea1c69c5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/ScriptEndItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/ScriptEndItem.java @@ -29,7 +29,7 @@ public class ScriptEndItem extends GraphTargetItem implements ExitItem { } @Override - public String toString(List localData) { + public String toString(List localData) { return ""; } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/SwitchItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/SwitchItem.java index dd9e2d41f..5cde68ba4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/SwitchItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/SwitchItem.java @@ -45,7 +45,7 @@ public class SwitchItem extends LoopItem implements Block { } @Override - public String toString(List localData) { + public String toString(List localData) { String ret = ""; ret += "loopswitch" + loop.id + ":\r\n"; ret += hilight("switch(") + switchedObject.toString(localData) + hilight(")") + "\r\n{\r\n"; diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/TernarOpItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/TernarOpItem.java index a6fd7b892..62f75ff04 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/TernarOpItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/TernarOpItem.java @@ -32,7 +32,7 @@ public class TernarOpItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { return expression.toString(localData) + hilight("?") + onTrue.toString(localData) + hilight(":") + onFalse.toString(localData); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/TrueItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/TrueItem.java index 90c51f067..8c074a94d 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/TrueItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/TrueItem.java @@ -13,7 +13,7 @@ public class TrueItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { return "true"; } } diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/UnaryOpItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/UnaryOpItem.java index 0f032fea8..d496d54a5 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/UnaryOpItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/UnaryOpItem.java @@ -30,7 +30,7 @@ public abstract class UnaryOpItem extends GraphTargetItem { } @Override - public String toString(List localData) { + public String toString(List localData) { String s = (value == null ? "null" : value.toString(localData)); if (value != null) { if (value.precedence > precedence) { diff --git a/trunk/src/com/jpexs/decompiler/flash/graph/WhileItem.java b/trunk/src/com/jpexs/decompiler/flash/graph/WhileItem.java index a81ccc47c..8e203f1f4 100644 --- a/trunk/src/com/jpexs/decompiler/flash/graph/WhileItem.java +++ b/trunk/src/com/jpexs/decompiler/flash/graph/WhileItem.java @@ -38,7 +38,7 @@ public class WhileItem extends LoopItem implements Block { } @Override - public String toString(List localData) { + public String toString(List localData) { String ret = ""; ret += "loop" + loop.id + ":\r\n"; String expStr = ""; diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/NewVersionDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/NewVersionDialog.java index 5bc2d292b..3a72c55ef 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/NewVersionDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/NewVersionDialog.java @@ -17,8 +17,6 @@ package com.jpexs.decompiler.flash.gui; import com.jpexs.decompiler.flash.Main; -import static com.jpexs.decompiler.flash.Main.projectPage; -import static com.jpexs.decompiler.flash.Main.shortApplicationName; import com.jpexs.decompiler.flash.Version; import java.awt.Container; import java.awt.Dimension; @@ -130,7 +128,7 @@ public class NewVersionDialog extends JDialog implements ActionListener { } } if (desktop == null) { - JOptionPane.showMessageDialog(null, "New version of " + shortApplicationName + " is available: " + latestVersion.appName + ".\r\nPlease go to " + projectPage + " to download it.", "New version", JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(null, "New version of " + Main.shortApplicationName + " is available: " + latestVersion.appName + ".\r\nPlease go to " + Main.projectPage + " to download it.", "New version", JOptionPane.INFORMATION_MESSAGE); } } setVisible(false); diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/SHELLEXECUTEINFO.java b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/SHELLEXECUTEINFO.java index dcdec5771..76c4d00ba 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/SHELLEXECUTEINFO.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/SHELLEXECUTEINFO.java @@ -29,7 +29,7 @@ public class SHELLEXECUTEINFO extends Structure { public HANDLE hProcess; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"cbSize", "fMask", "hwnd", "lpVerb", "lpFile", "lpParameters", "lpDirectory", "nShow", "hInstApp", "lpIDList", "lpClass", "hKeyClass", "dwHotKey", "hMonitor", "hProcess"}); } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinBase.java b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinBase.java index cd7cb2b4f..c99a4752a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinBase.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinBase.java @@ -173,7 +173,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public int dwHighDateTime; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"dwLowDateTime", "dwHighDateTime"}); } @@ -300,7 +300,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public short wMilliseconds; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"wYear", "wMonth", "wDayOfWeek", "wDay", "wHour", "wMinute", "wSecond", "wMilliseconds"}); } } @@ -395,7 +395,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public HANDLE hEvent; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"Internal", "InternalHigh", "Offset", "OffsetHigh", "hEvent"}); } } @@ -429,7 +429,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public WORD wReserved; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"wProcessorArchitecture", "wReserved"}); } } @@ -510,7 +510,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public WORD wProcessorRevision; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"processorArchitecture", "dwPageSize", "lpMinimumApplicationAddress", "lpMaximumApplicationAddress", "dwActiveProcessorMask", "dwNumberOfProcessors", "dwProcessorType", "dwAllocationGranularity", "wProcessorLevel", "wProcessorRevision"}); } } @@ -571,7 +571,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public DWORDLONG ullAvailExtendedVirtual; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"dwLength", "dwMemoryLoad", "ullTotalPhys", "ullAvailPhys", "ullTotalPageFile", "ullAvailPageFile", "ullTotalVirtual", "ullAvailVirtual", "ullAvailExtendedVirtual"}); } @@ -605,7 +605,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public boolean bInheritHandle; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"dwLength", "lpSecurityDescriptor", "bInheritHandle"}); } @@ -767,7 +767,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public HANDLE hStdError; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"cb", "lpReserved", "lpDesktop", "lpTitle", "dwX", "dwY", "dwXSize", "dwYSize", "dwXCountChars", "dwYCountChars", "dwFillAttribute", "dwFlags", "wShowWindow", "cbReserved2", "lpReserved2", "hStdInput", "hStdOutput", "hStdError"}); } @@ -811,7 +811,7 @@ public interface WinBase extends StdCallLibrary, WinDef, BaseTSD { public DWORD dwThreadId; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"hProcess", "hThread", "dwProcessId", "dwThreadId"}); } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinDef.java b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinDef.java index 4b86340e3..1250bc6f0 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinDef.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinDef.java @@ -609,7 +609,7 @@ public interface WinDef extends StdCallLibrary { * @see com.sun.jna.Structure#getFieldOrder() */ @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"left", "top", "right", "bottom"}); } @@ -870,7 +870,7 @@ public interface WinDef extends StdCallLibrary { * @see com.sun.jna.Structure#getFieldOrder() */ @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"x", "y"}); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinNT.java b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinNT.java index cc5336824..935820f26 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinNT.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinNT.java @@ -228,7 +228,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public DWORD Attributes; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"Luid", "Attributes"}); } @@ -258,7 +258,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public LUID_AND_ATTRIBUTES Privileges[]; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"PrivilegeCount", "Privileges"}); } @@ -468,7 +468,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public char[] FileName = new char[1]; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"NextEntryOffset", "Action", "FileNameLength", "FileName"}); } @@ -700,7 +700,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public int HighPart; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"LowPart", "HighPart"}); } } @@ -720,7 +720,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public DWORD HighPart; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"LowPart", "HighPart"}); } } @@ -733,7 +733,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public UNION u; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"u"}); } @@ -1235,7 +1235,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public char szCSDVersion[]; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"dwOSVersionInfoSize", "dwMajorVersion", "dwMinorVersion", "dwBuildNumber", "dwPlatformId", "szCSDVersion"}); } @@ -1312,7 +1312,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public byte wReserved; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"dwOSVersionInfoSize", "dwMajorVersion", "dwMinorVersion", "dwBuildNumber", "dwPlatformId", "szCSDVersion", "wServicePackMajor", "wServicePackMinor", "wSuiteMask", "wProductType", "wReserved"}); } @@ -1489,7 +1489,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public DWORD DataOffset; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"Length", "Reserved", "RecordNumber", "TimeGenerated", "TimeWritten", "EventID", "EventType", "NumStrings", "EventCategory", "ReservedFlags", "ClosingRecordNumber", "StringOffset", "UserSidLength", "UserSidOffset", "DataLength", "DataOffset"}); } @@ -1588,7 +1588,7 @@ public interface WinNT extends WinError, WinDef, WinBase, BaseTSD { public byte[] data; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"data"}); } } diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinUser.java b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinUser.java index 9e3ab2450..2c2aef8d6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinUser.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/player/jna/platform/win32/WinUser.java @@ -88,7 +88,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public RECT rcCaret; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"cbSize", "flags", "hwndActive", "hwndFocus", "hwndCapture", "hwndMenuOwner", "hwndMoveSize", "hwndCaret", "rcCaret"}); @@ -109,7 +109,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public short wCreatorVersion; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"cbSize", "rcWindow", "rcClient", "dwStyle", "dwExStyle", "dwWindowStatus", "cxWindowBorders", "cyWindowBorders", "atomWindowType", @@ -155,7 +155,7 @@ public interface WinUser extends StdCallLibrary, WinDef { } @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"x", "y"}); } } @@ -170,7 +170,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public POINT pt; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"hWnd", "message", "wParam", "lParam", "time", "pt"}); } @@ -185,7 +185,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public int dwTimeout; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"cbSize", "hWnd", "dwFlags", "uCount", "dwTimeout"}); } @@ -220,7 +220,7 @@ public interface WinUser extends StdCallLibrary, WinDef { } @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"cx", "cy"}); } } @@ -237,7 +237,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public byte AlphaFormat; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"BlendOp", "BlendFlags", "SourceConstantAlpha", "AlphaFormat"}); } @@ -338,7 +338,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public ULONG_PTR dwExtraInfo; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"vkCode", "scanCode", "flags", "time", "dwExtraInfo"}); } @@ -571,7 +571,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public WinDef.WORD wParamH; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"uMsg", "wParamL", "wParamH"}); } } @@ -608,7 +608,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public INPUT_UNION input = new INPUT_UNION(); @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"type", "input"}); } @@ -699,7 +699,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public BaseTSD.ULONG_PTR dwExtraInfo; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"wVk", "wScan", "dwFlags", "time", "dwExtraInfo"}); } @@ -736,7 +736,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public BaseTSD.ULONG_PTR dwExtraInfo; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"dx", "dy", "mouseData", "dwFlags", "time", "dwExtraInfo"}); } @@ -752,7 +752,7 @@ public interface WinUser extends StdCallLibrary, WinDef { public int dwTime; @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"cbSize", "dwTime"}); } } @@ -845,7 +845,7 @@ public interface WinUser extends StdCallLibrary, WinDef { * @see com.sun.jna.Structure#getFieldOrder() */ @Override - protected List getFieldOrder() { + protected List getFieldOrder() { return Arrays.asList(new String[]{"cbSize", "style", "lpfnWndProc", "cbClsExtra", "cbWndExtra", "hInstance", "hIcon", "hCursor", "hbrBackground", "lpszMenuName", diff --git a/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java b/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java index af605921f..7169b5172 100644 --- a/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java +++ b/trunk/src/com/jpexs/decompiler/flash/helpers/Helper.java @@ -280,8 +280,8 @@ public class Helper { } } - public static List toList(Object... rest) { - List ret = new ArrayList(); + public static List toList(Object... rest) { + List ret = new ArrayList(); for (Object o : rest) { ret.add(o); } @@ -338,7 +338,7 @@ public class Helper { return str.replaceAll("([^\r\n]*)(\r?\n)", "; $1$2"); } - public static String stackToString(Stack stack, List localData) { + public static String stackToString(Stack stack, List localData) { String ret = "["; for (int i = stack.size() - 1; i >= 0; i--) { if (i < stack.size() - 1) { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java index 748ba2f37..737d0c209 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineBitsLossless2Tag.java @@ -19,7 +19,6 @@ package com.jpexs.decompiler.flash.tags; import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.SWFInputStream; import com.jpexs.decompiler.flash.SWFOutputStream; -import static com.jpexs.decompiler.flash.tags.DefineBitsLosslessTag.FORMAT_24BIT_RGB; import com.jpexs.decompiler.flash.tags.base.AloneTag; import com.jpexs.decompiler.flash.tags.base.ImageTag; import com.jpexs.decompiler.flash.types.ALPHABITMAPDATA; @@ -57,7 +56,7 @@ public class DefineBitsLossless2Tag extends ImageTag implements AloneTag { public void setImage(byte data[]) throws IOException { BufferedImage image = ImageIO.read(new ByteArrayInputStream(data)); ALPHABITMAPDATA bitmapData = new ALPHABITMAPDATA(); - bitmapFormat = FORMAT_24BIT_RGB; + bitmapFormat = DefineBitsLosslessTag.FORMAT_24BIT_RGB; bitmapWidth = image.getWidth(); bitmapHeight = image.getHeight(); bitmapData.bitmapPixelData = new ARGB[bitmapWidth * bitmapHeight]; diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/base/ImageTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/base/ImageTag.java index a322df425..81b47d6f8 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/base/ImageTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/ImageTag.java @@ -16,7 +16,7 @@ */ package com.jpexs.decompiler.flash.tags.base; -import static com.jpexs.decompiler.flash.SWF.hasErrorHeader; +import com.jpexs.decompiler.flash.SWF; import com.jpexs.decompiler.flash.tags.Tag; import java.awt.image.BufferedImage; import java.io.IOException; @@ -43,7 +43,7 @@ public abstract class ImageTag extends CharacterTag { } public static String getImageFormat(byte data[]) { - if (hasErrorHeader(data)) { + if (SWF.hasErrorHeader(data)) { return "jpg"; } if (data.length > 2 && ((data[0] & 0xff) == 0xff) && ((data[1] & 0xff) == 0xd8)) { diff --git a/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java index be3b5384f..a702f9204 100644 --- a/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java +++ b/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java @@ -58,7 +58,6 @@ import com.jpexs.decompiler.flash.types.BUTTONRECORD; import com.jpexs.decompiler.flash.types.CXFORM; import com.jpexs.decompiler.flash.types.CXFORMWITHALPHA; import com.jpexs.decompiler.flash.types.FILLSTYLE; -import static com.jpexs.decompiler.flash.types.FILLSTYLE.*; import com.jpexs.decompiler.flash.types.FILLSTYLEARRAY; import com.jpexs.decompiler.flash.types.GRADIENT; import com.jpexs.decompiler.flash.types.GRADRECORD; @@ -263,7 +262,7 @@ public class XFLConverter { String ret = ""; //ret += ""; switch (fs.fillStyleType) { - case SOLID: + case FILLSTYLE.SOLID: ret += "= 3) { ret += fs.colorA.toHexRGB(); @@ -276,10 +275,10 @@ public class XFLConverter { } ret += " />"; break; - case REPEATING_BITMAP: - case CLIPPED_BITMAP: - case NON_SMOOTHED_REPEATING_BITMAP: - case NON_SMOOTHED_CLIPPED_BITMAP: + case FILLSTYLE.REPEATING_BITMAP: + case FILLSTYLE.CLIPPED_BITMAP: + case FILLSTYLE.NON_SMOOTHED_REPEATING_BITMAP: + case FILLSTYLE.NON_SMOOTHED_CLIPPED_BITMAP: ret += ""; ret += ""; break; - case LINEAR_GRADIENT: - case RADIAL_GRADIENT: - case FOCAL_RADIAL_GRADIENT: + case FILLSTYLE.LINEAR_GRADIENT: + case FILLSTYLE.RADIAL_GRADIENT: + case FILLSTYLE.FOCAL_RADIAL_GRADIENT: - if (fs.fillStyleType == LINEAR_GRADIENT) { + if (fs.fillStyleType == FILLSTYLE.LINEAR_GRADIENT) { ret += ""; GRADRECORD records[]; - if (fs.fillStyleType == FOCAL_RADIAL_GRADIENT) { + if (fs.fillStyleType == FILLSTYLE.FOCAL_RADIAL_GRADIENT) { records = fs.focalGradient.gradientRecords; } else { records = fs.gradient.gradientRecords; @@ -359,7 +358,7 @@ public class XFLConverter { ret += " ratio=\"" + rec.getRatioFloat() + "\""; ret += " />"; } - if (fs.fillStyleType == LINEAR_GRADIENT) { + if (fs.fillStyleType == FILLSTYLE.LINEAR_GRADIENT) { ret += ""; } else { ret += ""; diff --git a/trunk/testdata/as2/as2.fla b/trunk/testdata/as2/as2.fla index 47f7a8d77..caf1fb8a0 100644 Binary files a/trunk/testdata/as2/as2.fla and b/trunk/testdata/as2/as2.fla differ diff --git a/trunk/testdata/as2/as2.html b/trunk/testdata/as2/as2.html index 121b30245..ba2439c56 100644 --- a/trunk/testdata/as2/as2.html +++ b/trunk/testdata/as2/as2.html @@ -1,318 +1,49 @@ - - - -as2 - - - - - - - - - + + + + as2 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + Get Adobe Flash player + + + + + +
+ diff --git a/trunk/testdata/as2/as2.swf b/trunk/testdata/as2/as2.swf index 9dc5b3de6..7abb92210 100644 Binary files a/trunk/testdata/as2/as2.swf and b/trunk/testdata/as2/as2.swf differ diff --git a/trunk/testdata/as3/TestMovie.as b/trunk/testdata/as3/TestMovie.as index 04a9673e9..6fadd8040 100644 --- a/trunk/testdata/as3/TestMovie.as +++ b/trunk/testdata/as3/TestMovie.as @@ -1,4 +1,4 @@ -package +package { import flash.display.Sprite; import flash.text.TextField; @@ -6,7 +6,8 @@ package public class TestMovie extends Sprite { - + public static const instance:TestMovie = new TestMovie(); + public static var k = {a:6,b:7,c:9}; public function TestMovie() { var display_txt:TextField = new TextField(); @@ -14,8 +15,13 @@ package addChild(display_txt); var t:Test = new Test(); t.testHello(); + testObj({a:5,b:6,c:7}); } + public function testObj(o:Object){ + trace(o); + } + public static var staticVariable:int = 5; public static var staticVariable2:int = 5; diff --git a/trunk/testdata/as3/TestMovie.fla b/trunk/testdata/as3/TestMovie.fla index f581ef8c8..4e0995c01 100644 Binary files a/trunk/testdata/as3/TestMovie.fla and b/trunk/testdata/as3/TestMovie.fla differ diff --git a/trunk/testdata/as3/TestMovie.html b/trunk/testdata/as3/TestMovie.html index c80483d3b..86bc57476 100644 --- a/trunk/testdata/as3/TestMovie.html +++ b/trunk/testdata/as3/TestMovie.html @@ -1,318 +1,49 @@ - - - -TestMovie - - - - - - - - - + + + + TestMovie + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + Get Adobe Flash player + + + + + +
+ diff --git a/trunk/testdata/as3/TestMovie.swf b/trunk/testdata/as3/TestMovie.swf index efe5dca3c..f2a616e99 100644 Binary files a/trunk/testdata/as3/TestMovie.swf and b/trunk/testdata/as3/TestMovie.swf differ diff --git a/trunk/testdata/as3/build.bat b/trunk/testdata/as3/build.bat index 71f104168..5b260b546 100644 --- a/trunk/testdata/as3/build.bat +++ b/trunk/testdata/as3/build.bat @@ -8,7 +8,7 @@ set ISDEBUG=true set COMPILERPATH=..\..\flex_sdk\bin\mxmlc.exe if not exist %COMPILERPATH% goto notex %COMPILERPATH% -warnings=false -debug=%ISDEBUG% TestMovie.as>out.txt -start notepad out.txt +rem start notepad out.txt if errorlevel==1 goto failed goto end :notex diff --git a/trunk/testdata/as3/classes/TestClass3.as b/trunk/testdata/as3/classes/TestClass3.as index cc06b6f30..919e42468 100644 --- a/trunk/testdata/as3/classes/TestClass3.as +++ b/trunk/testdata/as3/classes/TestClass3.as @@ -1,8 +1,75 @@ -package classes +package classes { - + import flash.utils.ByteArray; + import flash.utils.Dictionary; + import com.hurlant.math.BigInteger; + import flash.filters.ColorMatrixFilter; + import com.wirelust.as3zlib.Inflate; + public class TestClass3 { - + /*[Embed(source="image.png", + mimeType="image/png")] + private static var pngImg:Class; + + [Embed(source="image.jpg", + mimeType="image/jpeg")] + private static var jpegImg:Class; + + [Embed(source="image.gif", + mimeType="image/gif")] + private static var gifImg:Class; + + [Embed(source = "malgun.ttf", fontName="Malgun", mimeType = 'application/x-font', embedAsCFF = "false")] + public static const fnt:Class; + + [Embed(source = "malgun.ttf", fontName="Malgun", mimeType = 'application/x-font-truetype', embedAsCFF = "false")] + public static const fntttf:Class; + + [Embed(source="as2.swf", + mimeType="application/x-shockwave-flash")] + private static var swf:Class; + + [Embed(source="audio.mp3", + mimeType="audio/mpeg")] + private static var mpg:Class; + + [Embed(source="image.svg", + mimeType="image/svg")] + private static var svg:Class; + + [Embed(source="image.svg", + mimeType="image/svg-xml")] + private static var svgxml:Class; + + [Embed(source="text.txt", + mimeType="application/octet-stream")] + private static var txt:Class;*/ + + /*var c = [1, 2, 3, 4, 5]; + var b = 1; + trace("++arr"); + b = ++c[2]; + trace("arr++"); + b = c[2]++; + trace("--arr"); + b = --c[2]; + trace("arr--"); + b = c[2]--;*/ + + + public function testIncDec() + { + var a = 5; + var b = 0; + trace("++var"); + b = ++a; + trace("var++"); + b = a++; + trace("--var"); + b = --a; + trace("var--"); + b = a--; + } } }