diff --git a/trunk/doc/avm2opcodes.htm b/trunk/doc/avm2opcodes.htm new file mode 100644 index 000000000..0cca695a3 --- /dev/null +++ b/trunk/doc/avm2opcodes.htm @@ -0,0 +1,167 @@ + +Paste number 70938: complete AVM2 opcodes, from Tamarin sources.
Paste number 70938: complete AVM2 opcodes, from Tamarin sources.

Paste number 70938: complete AVM2 opcodes, from Tamarin sources.
Pasted by: fusss
When:2 years, 7 months ago
Share:Tweet this! | http://paste.lisp.org/+1IQI
Channel:#lisp
Paste contents:
Raw Source | XML | Display As 
;; 160 opcodes. only 136 are in the avm2 docs.
+add:int = 0xA0
+add_d:int = 0x9B
+add_i:int = 0xC5
+applytype:int = 0x53
+astype:int = 0x86
+astypelate:int = 0x87
+bitand:int = 0xA8
+bitnot:int = 0x97
+bitor:int = 0xA9
+bitxor:int = 0xAA
+bkpt:int = 0x01
+bkptline:int = 0xF2
+call:int = 0x41
+callinterface:int = 0x4D
+callmethod:int = 0x43
+callproperty:int = 0x46
+callproplex:int = 0x4C
+callpropvoid:int = 0x4F
+callstatic:int = 0x44
+callsuper:int = 0x45
+callsuperid:int = 0x4B
+callsupervoid:int = 0x4E
+coerce:int = 0x80
+coerce_a:int = 0x82
+coerce_b:int = 0x81
+coerce_d:int = 0x84
+coerce_i:int = 0x83
+coerce_o:int = 0x89
+coerce_s:int = 0x85
+coerce_u:int = 0x88
+concat:int = 0x9A
+construct:int = 0x42
+constructprop:int = 0x4A
+constructsuper:int = 0x49
+convert_b:int = 0x76
+convert_d:int = 0x75
+convert_i:int = 0x73
+convert_o:int = 0x77
+convert_s:int = 0x70
+convert_u:int = 0x74
+debug:int = 0xEF
+debugfile:int = 0xF1
+debugline:int = 0xF0
+declocal:int = 0x94
+declocal_i:int = 0xC3
+decrement:int = 0x93
+decrement_i:int = 0xC1
+deleteproperty:int = 0x6A
+deletepropertylate:int = 0x6B
+divide:int = 0xA3
+dup:int = 0x2A
+dxns:int = 0x06
+dxnslate:int = 0x07
+equals:int = 0xAB
+esc_xattr:int = 0x72
+esc_xelem:int = 0x71
+finddef:int = 0x5F
+findproperty:int = 0x5E
+findpropstrict:int = 0x5D
+getdescendants:int = 0x59
+getglobalscope:int = 0x64
+getglobalslot:int = 0x6E
+getlex:int = 0x60
+getlocal0:int = 0xD0
+getlocal1:int = 0xD1
+getlocal2:int = 0xD2
+getlocal3:int = 0xD3
+getlocal:int = 0x62
+getouterscope:int = 0x67
+getproperty:int = 0x66
+getscopeobject:int = 0x65
+getslot:int = 0x6C
+getsuper:int = 0x04
+greaterequals:int = 0xB0
+greaterthan:int = 0xAF
+hasnext2:int = 0x32
+hasnext:int = 0x1F
+ifeq:int = 0x13
+iffalse:int = 0x12
+ifge:int = 0x18
+ifgt:int = 0x17
+ifle:int = 0x16
+iflt:int = 0x15
+ifne:int = 0x14
+ifnge:int = 0x0F
+ifngt:int = 0x0E
+ifnle:int = 0x0D
+ifnlt:int = 0x0C
+ifstricteq:int = 0x19
+ifstrictne:int = 0x1A
+iftrue:int = 0x11
+in:int = 0xB4
+inclocal:int = 0x92
+inclocal_i:int = 0xC2
+increment:int = 0x91
+increment_i:int = 0xC0
+initproperty:int = 0x68
+instanceof:int = 0xB1
+istype:int = 0xB2
+istypelate:int = 0xB3
+jump:int = 0x10
+kill:int = 0x08
+label:int = 0x09
+lessequals:int = 0xAE
+lessthan:int = 0xAD
+lookupswitch:int = 0x1B
+lshift:int = 0xA5
+modulo:int = 0xA4
+multiply:int = 0xA2
+multiply_i:int = 0xC7
+negate:int = 0x90
+negate_i:int = 0xC4
+newactivation:int = 0x57
+newarray:int = 0x56
+newcatch:int = 0x5A
+newclass:int = 0x58
+newfunction:int = 0x40
+newobject:int = 0x55
+nextname:int = 0x1E
+nextvalue:int = 0x23
+nop:int = 0x02
+not:int = 0x96
+pop:int = 0x29
+popscope:int = 0x1D
+pushbyte:int = 0x24
+pushconstant:int = 0x22
+pushdouble:int = 0x2F
+pushfalse:int = 0x27
+pushint:int = 0x2D
+pushnamespace:int = 0x31
+pushnan:int = 0x28
+pushnull:int = 0x20
+pushscope:int = 0x30
+pushshort:int = 0x25
+pushstring:int = 0x2C
+pushtrue:int = 0x26
+pushuint:int = 0x2E
+pushundefined:int = 0x21
+pushwith:int = 0x1C
+returnvalue:int = 0x48
+returnvoid:int = 0x47
+rshift:int = 0xA6
+setglobalslot:int = 0x6F
+setlocal0:int = 0xD4
+setlocal1:int = 0xD5
+setlocal2:int = 0xD6
+setlocal3:int = 0xD7
+setlocal:int = 0x63
+setproperty:int = 0x61
+setpropertylate:int = 0x69
+setslot:int = 0x6D
+setsuper:int = 0x05
+strictequals:int = 0xAC
+subtract:int = 0xA1
+subtract_i:int = 0xC6
+swap:int = 0x2B
+throw:int = 0x03
+typeof:int = 0x95
+urshift:int = 0xA7
+

This paste has no annotations.

Colorize as:
Show Line Numbers

+

98

+
+

Lisppaste + pastes can be made by anyone at any time. Imagine a fearsomely +comprehensive disclaimer of liability. Now fear, comprehensively. \ No newline at end of file diff --git a/trunk/doc/avm2overview.doc b/trunk/doc/avm2overview.doc new file mode 100644 index 000000000..ad05916dd Binary files /dev/null and b/trunk/doc/avm2overview.doc differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/ByteArray.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/ByteArray.class deleted file mode 100644 index 5b1735c76..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/ByteArray.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/CatchedListener.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/CatchedListener.class deleted file mode 100644 index b046b358d..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/CatchedListener.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Client.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Client.class deleted file mode 100644 index afbbf33f2..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Client.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Connection.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Connection.class deleted file mode 100644 index 44beca661..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Connection.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Copy.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Copy.class deleted file mode 100644 index 0e6e936d7..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Copy.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Handler.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Handler.class deleted file mode 100644 index 02c2ae923..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Handler.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Http.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Http.class deleted file mode 100644 index 650f89b66..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Http.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/HttpConnection.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/HttpConnection.class deleted file mode 100644 index c7ed36f92..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/HttpConnection.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/HttpRelay.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/HttpRelay.class deleted file mode 100644 index dd468a914..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/HttpRelay.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Https.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Https.class deleted file mode 100644 index e4386bfd5..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Https.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Key.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Key.class deleted file mode 100644 index 266018f29..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Key.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Main$1.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Main$1.class deleted file mode 100644 index 387df453f..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Main$1.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Main$2.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Main$2.class deleted file mode 100644 index 735218e46..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Main$2.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Main.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Main.class deleted file mode 100644 index 2ba30123b..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Main.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Message.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Message.class deleted file mode 100644 index 61c8a8050..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Message.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/ReplacedListener.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/ReplacedListener.class deleted file mode 100644 index 9968bb94e..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/ReplacedListener.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Replacement.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Replacement.class deleted file mode 100644 index 2975a5f5b..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Replacement.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Reply.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Reply.class deleted file mode 100644 index baf80b9cf..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Reply.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Request.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Request.class deleted file mode 100644 index c4a504a38..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Request.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/RetryRequestException.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/RetryRequestException.class deleted file mode 100644 index 8256ab0e4..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/RetryRequestException.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Server.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Server.class deleted file mode 100644 index 1074da80a..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/Server.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/WorkerThread.class b/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/WorkerThread.class deleted file mode 100644 index 225ee6f66..000000000 Binary files a/trunk/libsrc/jpproxy/build/classes/com/jpexs/proxy/WorkerThread.class and /dev/null differ diff --git a/trunk/libsrc/jpproxy/dist/JP_NoAds.zip b/trunk/libsrc/jpproxy/dist/JP_NoAds.zip deleted file mode 100644 index c78006e36..000000000 Binary files a/trunk/libsrc/jpproxy/dist/JP_NoAds.zip and /dev/null differ diff --git a/trunk/libsrc/jpproxy/dist/config/replacements.ini b/trunk/libsrc/jpproxy/dist/config/replacements.ini deleted file mode 100644 index f098c712b..000000000 --- a/trunk/libsrc/jpproxy/dist/config/replacements.ini +++ /dev/null @@ -1,12 +0,0 @@ -http://archiv.nova.cz/static/cz/shared/app/MediaCenter.swf -.\config\saved\asdec_85f11ffb.tmp -http://admin.brightcove.com/viewer/us1.24.00.00/federatedVideo/BrightcovePlayer.swf -.\config\saved\asdec_d5ca3577.tmp -http://archiv.nova.cz/static/cz/shared/app/MediaCenter_Catchup.swf -.\config\saved\asdec_d08cceb2.tmp -http://abc.go.com/vp2/ws/utils/2000/geo/video/geolocation -.\config\saved\asdec_70eaddc7.tmp -http://ll.static.abc.com/m/vp2/prod/flash/VP2.swf?ver=* -.\config\saved\asdec_a3d1aa1c.tmp -http://archiv.nova.cz/static/shared/app/flowplayer/OpenAdStreamer-*.swf -.\config\saved\asdec_65483348.tmp diff --git a/trunk/libsrc/jpproxy/dist/config/saved/asdec_65483348.tmp b/trunk/libsrc/jpproxy/dist/config/saved/asdec_65483348.tmp deleted file mode 100644 index 8cecad84a..000000000 Binary files a/trunk/libsrc/jpproxy/dist/config/saved/asdec_65483348.tmp and /dev/null differ diff --git a/trunk/libsrc/jpproxy/dist/config/saved/asdec_70eaddc7.tmp b/trunk/libsrc/jpproxy/dist/config/saved/asdec_70eaddc7.tmp deleted file mode 100644 index a303f962e..000000000 --- a/trunk/libsrc/jpproxy/dist/config/saved/asdec_70eaddc7.tmp +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/trunk/libsrc/jpproxy/dist/config/saved/asdec_85f11ffb.tmp b/trunk/libsrc/jpproxy/dist/config/saved/asdec_85f11ffb.tmp deleted file mode 100644 index 6371c6aed..000000000 Binary files a/trunk/libsrc/jpproxy/dist/config/saved/asdec_85f11ffb.tmp and /dev/null differ diff --git a/trunk/libsrc/jpproxy/dist/config/saved/asdec_a3d1aa1c.tmp b/trunk/libsrc/jpproxy/dist/config/saved/asdec_a3d1aa1c.tmp deleted file mode 100644 index 5dd9c1b90..000000000 Binary files a/trunk/libsrc/jpproxy/dist/config/saved/asdec_a3d1aa1c.tmp and /dev/null differ diff --git a/trunk/libsrc/jpproxy/dist/config/saved/asdec_d08cceb2.tmp b/trunk/libsrc/jpproxy/dist/config/saved/asdec_d08cceb2.tmp deleted file mode 100644 index 7ff4fb030..000000000 Binary files a/trunk/libsrc/jpproxy/dist/config/saved/asdec_d08cceb2.tmp and /dev/null differ diff --git a/trunk/libsrc/jpproxy/dist/config/saved/asdec_d5ca3577.tmp b/trunk/libsrc/jpproxy/dist/config/saved/asdec_d5ca3577.tmp deleted file mode 100644 index d9f98346b..000000000 Binary files a/trunk/libsrc/jpproxy/dist/config/saved/asdec_d5ca3577.tmp and /dev/null differ diff --git a/trunk/libsrc/jpproxy/dist/jpproxy.jar b/trunk/libsrc/jpproxy/dist/jpproxy.jar deleted file mode 100644 index ab85e8639..000000000 Binary files a/trunk/libsrc/jpproxy/dist/jpproxy.jar and /dev/null 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 b081c64bf..35f42a03c 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/generated-sources/jflex/jsyntaxpane/lexers/Flasm3Lexer.java~ b/trunk/libsrc/jsyntaxpane/jsyntaxpane/target/generated-sources/jflex/jsyntaxpane/lexers/Flasm3Lexer.java~ index cb20fbfe5..c85450b06 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 28.7.10 15:00 */ +/* The following code was generated by JFlex 1.4.3 on 18.8.10 12:21 */ /* Flash assembler language lexer specification */ @@ -12,7 +12,7 @@ import jsyntaxpane.TokenType; /** * This class is a scanner generated by * JFlex 1.4.3 - * on 28.7.10 15:00 from the specification file + * 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 */ public final class Flasm3Lexer extends DefaultJFlexLexer { @@ -43,9 +43,9 @@ public final class Flasm3Lexer extends DefaultJFlexLexer { */ 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\25\1\0\1\10\6\0\1\21\1\0\1\21\1\16\1\0\1\15"+ - "\3\15\4\22\2\6\1\14\1\23\5\0\4\10\1\17\25\10\1\5"+ - "\1\24\1\7\1\0\1\13\1\0\4\12\1\20\7\12\1\4\15\12"+ + "\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"+ @@ -141,12 +141,12 @@ public final class Flasm3Lexer extends DefaultJFlexLexer { 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\1\1\1\11\1\12\1\0"+ - "\1\13\1\14\2\3\1\0\1\10\1\0\2\11\1\3"+ + "\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"; private static int [] zzUnpackAction() { - int [] result = new int[36]; + int [] result = new int[38]; int offset = 0; offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); return result; @@ -171,14 +171,14 @@ public final class Flasm3Lexer extends DefaultJFlexLexer { private static final int [] ZZ_ROWMAP = zzUnpackRowMap(); private static final String ZZ_ROWMAP_PACKED_0 = - "\0\0\0\26\0\54\0\102\0\130\0\156\0\204\0\232"+ - "\0\260\0\102\0\306\0\102\0\334\0\102\0\362\0\u0108"+ - "\0\u011e\0\u0134\0\u014a\0\102\0\204\0\102\0\102\0\u0160"+ - "\0\u0176\0\u018c\0\u01a2\0\u01b8\0\u01ce\0\102\0\102\0\u01e4"+ - "\0\u01fa\0\u01fa\0\u0210\0\102"; + "\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"; private static int [] zzUnpackRowMap() { - int [] result = new int[36]; + int [] result = new int[38]; int offset = 0; offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); return result; @@ -202,30 +202,31 @@ 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"+ - "\3\4\1\7\1\6\5\4\1\10\1\11\1\12\21\10"+ + "\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"+ - "\2\21\1\4\1\20\1\23\1\4\1\24\31\0\1\5"+ - "\26\0\1\6\1\0\1\6\1\0\2\25\2\6\1\26"+ - "\1\6\1\0\1\25\1\6\1\0\1\6\7\0\1\25"+ - "\1\0\1\25\1\0\4\25\1\26\1\25\1\0\2\25"+ - "\1\0\1\25\3\0\1\10\2\0\21\10\4\0\1\12"+ - "\23\0\2\27\1\0\12\27\1\30\4\27\1\31\3\27"+ - "\2\0\1\16\27\0\1\21\1\32\1\21\1\0\4\21"+ - "\1\0\1\21\1\0\2\21\1\0\1\21\11\0\1\20"+ - "\6\0\1\20\1\33\2\34\1\0\1\20\7\0\1\21"+ - "\1\0\1\21\1\0\4\21\1\0\1\21\1\0\2\21"+ - "\1\0\1\21\11\0\1\33\6\0\1\33\4\0\1\33"+ - "\3\0\1\23\1\35\1\36\23\23\15\0\1\31\4\0"+ - "\1\31\20\0\1\37\4\0\1\37\11\0\1\40\6\0"+ - "\1\40\4\0\1\40\11\0\1\33\6\0\1\33\1\0"+ - "\2\34\1\0\1\33\11\0\1\41\6\0\1\41\3\0"+ - "\1\42\1\41\5\0\1\36\31\0\1\40\1\43\5\0"+ - "\1\40\4\0\1\40\11\0\1\41\6\0\1\41\4\0"+ - "\1\41\30\0\1\44"; + "\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"; private static int [] zzUnpackTrans() { - int [] result = new int[550]; + int [] result = new int[598]; int offset = 0; offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); return result; @@ -264,11 +265,11 @@ public final class Flasm3Lexer 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"+ - "\5\1\1\11\1\0\2\11\2\1\1\0\1\1\1\0"+ + "\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"; private static int [] zzUnpackAttribute() { - int [] result = new int[36]; + int [] result = new int[38]; int offset = 0; offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); return result; diff --git a/trunk/nbproject/build-impl.xml b/trunk/nbproject/build-impl.xml index ca54e3081..c8a3f5119 100644 --- a/trunk/nbproject/build-impl.xml +++ b/trunk/nbproject/build-impl.xml @@ -291,15 +291,18 @@ is divided into following sections: Must set javac.includes - + + + - + + diff --git a/trunk/nbproject/genfiles.properties b/trunk/nbproject/genfiles.properties index 6735c9257..2bd22b1b3 100644 --- a/trunk/nbproject/genfiles.properties +++ b/trunk/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=6767af7d -nbproject/build-impl.xml.script.CRC32=94147f4c -nbproject/build-impl.xml.stylesheet.CRC32=f33e10ff@1.38.2.45 +nbproject/build-impl.xml.script.CRC32=ad555744 +nbproject/build-impl.xml.stylesheet.CRC32=229523de@1.38.3.45 diff --git a/trunk/testdata/as3.swf b/trunk/testdata/as3.swf index db83c18f3..d2dae32eb 100644 Binary files a/trunk/testdata/as3.swf and b/trunk/testdata/as3.swf differ diff --git a/trunk/testdata/classes/Test.as b/trunk/testdata/classes/Test.as index f862970d7..f7eca25a9 100644 --- a/trunk/testdata/classes/Test.as +++ b/trunk/testdata/classes/Test.as @@ -309,5 +309,24 @@ public class Test { var e=(a==b)?((c==d)?1:7):3; trace("e="+e); } + + public function testInnerIf(){ + var a=5; + var b=4; + if(a==5){ + if(b==6){ + trace("b==6"); + }else{ + trace("b!=6"); + } + }else{ + if(b==7){ + trace("b==7"); + }else{ + trace("b!=7"); + } + } + trace("end"); + } } } \ No newline at end of file