LegacyConsole/jpexs-decompiler
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-05-29 18:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

lexer fixes

Browse Source
This commit is contained in:
honfika@gmail.com
2014-11-30 00:09:29 +01:00
parent 29ab28f13f
commit 094ecd15e3
14 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/pcode/Flasm3Lexer.java
View File

@@ -3223,7 +3223,7 @@ public final class Flasm3Lexer {
case 110:
break;
case 10: {
return new ParsedSymbol(ParsedSymbol.TYPE_INTEGER, new Long(Long.parseLong((yytext()))));
return new ParsedSymbol(ParsedSymbol.TYPE_INTEGER, Long.parseLong((yytext())));
}
case 111:
break;
@@ -3322,7 +3322,7 @@ public final class Flasm3Lexer {
case 129:
break;
case 29: {
return new ParsedSymbol(ParsedSymbol.TYPE_FLOAT, new Double(Double.parseDouble((yytext()))));
return new ParsedSymbol(ParsedSymbol.TYPE_FLOAT, Double.parseDouble((yytext())));
}
case 130:
break;

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/pcode/flasm3.flex
View File

@@ -258,8 +258,8 @@ ExceptionTarget = "exceptiontarget "{PositiveNumberLiteral}":"
/* numeric literals */
{NumberLiteral} { return new ParsedSymbol(ParsedSymbol.TYPE_INTEGER, new Long(Long.parseLong((yytext())))); }
{FloatLiteral} { return new ParsedSymbol(ParsedSymbol.TYPE_FLOAT, new Double(Double.parseDouble((yytext())))); }
{NumberLiteral} { return new ParsedSymbol(ParsedSymbol.TYPE_INTEGER, Long.parseLong((yytext()))); }
{FloatLiteral} { return new ParsedSymbol(ParsedSymbol.TYPE_FLOAT, Double.parseDouble((yytext()))); }
{Identifier} { return new ParsedSymbol(ParsedSymbol.TYPE_IDENTIFIER, yytext()); }
{LineTerminator} {yybegin(YYINITIAL);}
{Comment} {return new ParsedSymbol(ParsedSymbol.TYPE_COMMENT, yytext().substring(1));}

16
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/ActionScriptLexer.java
View File

@@ -19,10 +19,10 @@
package com.jpexs.decompiler.flash.abc.avm2.parser.script;
import com.jpexs.decompiler.flash.abc.avm2.parser.AVM2ParseException;
import java.util.Stack;
import java.util.List;
import java.util.ArrayList;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
/**
* This class is a scanner generated by
@@ -1028,7 +1028,7 @@ public final class ActionScriptLexer {
return yychar;
}
private Stack<ParsedSymbol> pushedBack = new Stack<ParsedSymbol>();
private Stack<ParsedSymbol> pushedBack = new Stack<>();
public int yyline() {
return yyline + 1;
@@ -1439,7 +1439,7 @@ public final class ActionScriptLexer {
case 175:
break;
case 13: {
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong((yytext()))));
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong((yytext())));
}
case 176:
break;
@@ -1660,7 +1660,7 @@ public final class ActionScriptLexer {
case 212:
break;
case 50: {
return new ParsedSymbol(SymbolGroup.DOUBLE, SymbolType.DOUBLE, new Double(Double.parseDouble((yytext()))));
return new ParsedSymbol(SymbolGroup.DOUBLE, SymbolType.DOUBLE, Double.parseDouble((yytext())));
}
case 213:
break;
@@ -1727,7 +1727,7 @@ public final class ActionScriptLexer {
case 225:
break;
case 63: {
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong(yytext(), 8)));
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong(yytext(), 8));
}
case 226:
break;
@@ -1961,7 +1961,7 @@ public final class ActionScriptLexer {
case 264:
break;
case 102: {
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong(yytext().substring(2), 16)));
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong(yytext().substring(2), 16));
}
case 265:
break;

16
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/parser/script/actionscript.flex
View File

@@ -16,10 +16,10 @@
*/
package com.jpexs.decompiler.flash.abc.avm2.parser.script;
import com.jpexs.decompiler.flash.abc.avm2.parser.AVM2ParseException;
import java.util.Stack;
import java.util.List;
import java.util.ArrayList;
import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
%%
@@ -60,7 +60,7 @@ import java.io.StringReader;
return yychar;
}
private Stack<ParsedSymbol> pushedBack = new Stack<ParsedSymbol>();
private Stack<ParsedSymbol> pushedBack = new Stack<>();
public int yyline() {
return yyline + 1;
@@ -338,13 +338,13 @@ OIdentifierCharacter = [^\r\n\u00A7\\]
/* numeric literals */
{DecIntegerLiteral} { return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong((yytext())))); }
{DecIntegerLiteral} { return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong((yytext()))); }
{HexIntegerLiteral} { return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong(yytext().substring(2), 16))); }
{HexIntegerLiteral} { return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong(yytext().substring(2), 16)); }
{OctIntegerLiteral} { return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong(yytext(), 8))); }
{OctIntegerLiteral} { return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong(yytext(), 8)); }
{DoubleLiteral} { return new ParsedSymbol(SymbolGroup.DOUBLE, SymbolType.DOUBLE, new Double(Double.parseDouble((yytext())))); }
{DoubleLiteral} { return new ParsedSymbol(SymbolGroup.DOUBLE, SymbolType.DOUBLE, Double.parseDouble((yytext()))); }
/* comments */
{Comment} { /*ignore*/ }

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/MethodInfoLexer.java
View File

@@ -1022,7 +1022,7 @@ public final class MethodInfoLexer {
case 38:
break;
case 3: {
return new ParsedSymbol(ParsedSymbol.TYPE_INTEGER, new Long(Long.parseLong((yytext()))));
return new ParsedSymbol(ParsedSymbol.TYPE_INTEGER, Long.parseLong((yytext())));
}
case 39:
break;
@@ -1075,7 +1075,7 @@ public final class MethodInfoLexer {
case 47:
break;
case 12: {
return new ParsedSymbol(ParsedSymbol.TYPE_FLOAT, new Double(Double.parseDouble((yytext()))));
return new ParsedSymbol(ParsedSymbol.TYPE_FLOAT, Double.parseDouble((yytext())));
}
case 48:
break;

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/methodinfo_parser/methodinfo.flex
View File

@@ -112,8 +112,8 @@ StringCharacter = [^\r\n\"\\]
/* numeric literals */
{NumberLiteral} { return new ParsedSymbol(ParsedSymbol.TYPE_INTEGER, new Long(Long.parseLong((yytext())))); }
{FloatLiteral} { return new ParsedSymbol(ParsedSymbol.TYPE_FLOAT, new Double(Double.parseDouble((yytext())))); }
{NumberLiteral} { return new ParsedSymbol(ParsedSymbol.TYPE_INTEGER, Long.parseLong((yytext()))); }
{FloatLiteral} { return new ParsedSymbol(ParsedSymbol.TYPE_FLOAT, Double.parseDouble((yytext()))); }
":" {return new ParsedSymbol(ParsedSymbol.TYPE_COLON);}
"," {return new ParsedSymbol(ParsedSymbol.TYPE_COMMA);}

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/pcode/FlasmLexer.java
View File

@@ -1037,7 +1037,7 @@ public final class FlasmLexer {
case 40:
break;
case 10: {
return new ASMParsedSymbol(ASMParsedSymbol.TYPE_INTEGER, new Long(Long.parseLong((yytext()))));
return new ASMParsedSymbol(ASMParsedSymbol.TYPE_INTEGER, Long.parseLong((yytext())));
}
case 41:
break;
@@ -1111,7 +1111,7 @@ public final class FlasmLexer {
case 54:
break;
case 24: {
return new ASMParsedSymbol(ASMParsedSymbol.TYPE_FLOAT, new Double(Double.parseDouble((yytext()))));
return new ASMParsedSymbol(ASMParsedSymbol.TYPE_FLOAT, Double.parseDouble((yytext())));
}
case 55:
break;

4
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/pcode/flasm.flex
View File

@@ -140,8 +140,8 @@ Constant= constant{PositiveNumberLiteral}
/* numeric literals */
{NumberLiteral} { return new ASMParsedSymbol(ASMParsedSymbol.TYPE_INTEGER, new Long(Long.parseLong((yytext())))); }
{FloatLiteral} { return new ASMParsedSymbol(ASMParsedSymbol.TYPE_FLOAT, new Double(Double.parseDouble((yytext())))); }
{NumberLiteral} { return new ASMParsedSymbol(ASMParsedSymbol.TYPE_INTEGER, Long.parseLong((yytext()))); }
{FloatLiteral} { return new ASMParsedSymbol(ASMParsedSymbol.TYPE_FLOAT, Double.parseDouble((yytext()))); }
{LineTerminator} {yybegin(YYINITIAL); return new ASMParsedSymbol(ASMParsedSymbol.TYPE_EOL); }
{Comment} {return new ASMParsedSymbol(ASMParsedSymbol.TYPE_COMMENT, yytext().substring(1));}
{StartOfBlock} { yybegin(YYINITIAL); return new ASMParsedSymbol(ASMParsedSymbol.TYPE_BLOCK_START); }

18
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/ActionScriptLexer.java
View File

@@ -19,9 +19,9 @@
package com.jpexs.decompiler.flash.action.parser.script;
import com.jpexs.decompiler.flash.action.parser.ActionParseException;
import java.util.Stack;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
/**
* This class is a scanner generated by
@@ -1255,12 +1255,12 @@ public final class ActionScriptLexer {
return yychar;
}
private Stack<ParsedSymbol> pushedBack = new Stack<ParsedSymbol>();
private final Stack<ParsedSymbol> pushedBack = new Stack<>();
public int yyline() {
return yyline + 1;
}
private List<LexListener> listeners = new ArrayList<>();
private final List<LexListener> listeners = new ArrayList<>();
public void addListener(LexListener listener) {
listeners.add(listener);
@@ -1667,7 +1667,7 @@ public final class ActionScriptLexer {
case 196:
break;
case 13: {
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong((yytext()))));
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong((yytext())));
}
case 197:
break;
@@ -1832,7 +1832,7 @@ public final class ActionScriptLexer {
case 227:
break;
case 44: {
return new ParsedSymbol(SymbolGroup.DOUBLE, SymbolType.DOUBLE, new Double(Double.parseDouble((yytext()))));
return new ParsedSymbol(SymbolGroup.DOUBLE, SymbolType.DOUBLE, Double.parseDouble((yytext())));
}
case 228:
break;
@@ -1867,7 +1867,7 @@ public final class ActionScriptLexer {
case 234:
break;
case 51: {
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong(yytext(), 8)));
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong(yytext(), 8));
}
case 235:
break;
@@ -2018,7 +2018,7 @@ public final class ActionScriptLexer {
String s = yytext();
s = s.substring(1, s.length() - 1);
if (s.contains(" ")) {
s = s.substring(0, s.indexOf(" "));
s = s.substring(0, s.indexOf(' '));
}
xmlTagName = s;
string.append(yytext());
@@ -2046,7 +2046,7 @@ public final class ActionScriptLexer {
case 268:
break;
case 85: {
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong(yytext().substring(2), 16)));
return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong(yytext().substring(2), 16));
}
case 269:
break;

18
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/action/parser/script/actionscript.flex
View File

@@ -16,9 +16,9 @@
*/
package com.jpexs.decompiler.flash.action.parser.script;
import com.jpexs.decompiler.flash.action.parser.ActionParseException;
import java.util.Stack;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
import java.util.Stack;
%%
@@ -40,12 +40,12 @@ import java.util.ArrayList;
return yychar;
}
private Stack<ParsedSymbol> pushedBack = new Stack<ParsedSymbol>();
private final Stack<ParsedSymbol> pushedBack = new Stack<>();
public int yyline() {
return yyline + 1;
}
private List<LexListener> listeners = new ArrayList<>();
private final List<LexListener> listeners = new ArrayList<>();
public void addListener(LexListener listener){
listeners.add(listener);
@@ -318,13 +318,13 @@ OIdentifierCharacter = [^\r\n\u00A7\\]
/* numeric literals */
{DecIntegerLiteral} { return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong((yytext())))); }
{DecIntegerLiteral} { return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong((yytext()))); }
{HexIntegerLiteral} { return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong(yytext().substring(2), 16))); }
{HexIntegerLiteral} { return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong(yytext().substring(2), 16)); }
{OctIntegerLiteral} { return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, new Long(Long.parseLong(yytext(), 8))); }
{OctIntegerLiteral} { return new ParsedSymbol(SymbolGroup.INTEGER, SymbolType.INTEGER, Long.parseLong(yytext(), 8)); }
{DoubleLiteral} { return new ParsedSymbol(SymbolGroup.DOUBLE, SymbolType.DOUBLE, new Double(Double.parseDouble((yytext())))); }
{DoubleLiteral} { return new ParsedSymbol(SymbolGroup.DOUBLE, SymbolType.DOUBLE, Double.parseDouble((yytext()))); }
/* comments */
{Comment} { /*ignore*/ }
@@ -338,7 +338,7 @@ OIdentifierCharacter = [^\r\n\u00A7\\]
String s = yytext();
s = s.substring(1, s.length() - 1);
if (s.contains(" ")){
s = s.substring(0, s.indexOf(" "));
s = s.substring(0, s.indexOf(' '));
}
xmlTagName = s;
string.append(yytext());

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java
View File

@@ -695,7 +695,7 @@ public final class TextLexer {
if (string != null) {
String ret = string.toString();
string = null;
return new ParsedSymbol(SymbolType.TEXT, ret.toString());
return new ParsedSymbol(SymbolType.TEXT, ret);
}
}
case 20:

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/text/text.flex
View File

@@ -69,7 +69,7 @@ HexDigit = [0-9a-fA-F]
if(string != null){
String ret = string.toString();
string = null;
return new ParsedSymbol(SymbolType.TEXT,ret.toString());
return new ParsedSymbol(SymbolType.TEXT, ret);
}
}
/* escape sequences */

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/annotations/parser/ConditionLexer.java
View File

@@ -301,7 +301,7 @@ public final class ConditionLexer {
return yyline + 1;
}
private Stack<ConditionToken> pushedBack = new Stack<ConditionToken>();
private Stack<ConditionToken> pushedBack = new Stack<>();
public void pushback(ConditionToken symb) {
pushedBack.push(symb);

2
libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/types/annotations/parser/conditions.flex
View File

@@ -49,7 +49,7 @@ import java.util.Stack;
return yyline + 1;
}
private Stack<ConditionToken> pushedBack = new Stack<ConditionToken>();
private Stack<ConditionToken> pushedBack = new Stack<>();
public void pushback(ConditionToken symb) {
pushedBack.push(symb);