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

code format fixes in lexers

Browse Source
This commit is contained in:
honfika@gmail.com
2014-11-30 00:18:35 +01:00
parent 094ecd15e3
commit 825e50a4ef
10 changed files with 865 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2794,6 +2794,7 @@ public final class Flasm3Lexer {
pushedBack.push(symb);
last = null;
}
ParsedSymbol last;
public ParsedSymbol lex() throws java.io.IOException, AVM2ParseException {

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

@@ -34,10 +34,9 @@ import java.util.Stack;
%{
StringBuffer string = new StringBuffer();
boolean isMultiname = false;
long multinameId = 0;
StringBuffer string = new StringBuffer();
boolean isMultiname = false;
long multinameId = 0;
/**
* Create an empty lexer, yyrset will be called later to reset and assign
@@ -55,21 +54,19 @@ import java.util.Stack;
return yyline + 1;
}
private Stack<ParsedSymbol> pushedBack = new Stack<>();
public void pushback(ParsedSymbol symb) {
pushedBack.push(symb);
last = null;
}
ParsedSymbol last;
public ParsedSymbol lex() throws java.io.IOException, AVM2ParseException{
ParsedSymbol ret = null;
if(!pushedBack.isEmpty()){
if (!pushedBack.isEmpty()){
ret = last = pushedBack.pop();
}else{
} else {
ret = last = yylex();
}
return ret;
@@ -269,9 +266,9 @@ ExceptionTarget = "exceptiontarget "{PositiveNumberLiteral}":"
\" {
yybegin(PARAMETERS);
// length also includes the trailing quote
if(isMultiname){
if (isMultiname){
return new ParsedSymbol(ParsedSymbol.TYPE_MULTINAME, new Long(multinameId));
}else{
} else {
return new ParsedSymbol(ParsedSymbol.TYPE_STRING, string.toString());
}
}

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

File diff suppressed because it is too large Load Diff

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

@@ -65,6 +65,7 @@ import java.util.Stack;
public int yyline() {
return yyline + 1;
}
private List<LexListener> listeners=new ArrayList<>();
public void addListener(LexListener listener){
@@ -92,12 +93,13 @@ import java.util.Stack;
last = null;
informListenersPushBack(symb);
}
ParsedSymbol last;
public ParsedSymbol lex() throws java.io.IOException, AVM2ParseException{
ParsedSymbol ret=null;
if(!pushedBack.isEmpty()){
ParsedSymbol ret = null;
if (!pushedBack.isEmpty()){
ret = last = pushedBack.pop();
}else{
} else {
ret = last = yylex();
}
informListenersLex(ret);
@@ -368,7 +370,7 @@ OIdentifierCharacter = [^\r\n\u00A7\\]
{XmlAttribute} {
yybegin(XMLOPENTAGATTRIB);
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_ATTRIBUTENAME, yytext()));
if(string.length()>0){
if (string.length() > 0){
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT, string.toString()));
string.setLength(0);
}
@@ -377,7 +379,7 @@ OIdentifierCharacter = [^\r\n\u00A7\\]
"{" {
yybegin(YYINITIAL);
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_ATTRNAMEVAR_BEGIN, yytext()));
if(string.length()>0){
if (string.length() > 0){
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT, string.toString()));
string.setLength(0);
}
@@ -386,7 +388,7 @@ OIdentifierCharacter = [^\r\n\u00A7\\]
{XmlOpenTagEnd} {
yybegin(XML);
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_STARTTAG_END, yytext()));
if(string.length()>0){
if (string.length() > 0){
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT, string.toString()));
string.setLength(0);
}
@@ -395,7 +397,7 @@ OIdentifierCharacter = [^\r\n\u00A7\\]
{XmlOpenTagClose} {
yybegin(XML);
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_STARTFINISHTAG_END, yytext()));
if(string.length()>0){
if (string.length() > 0){
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT, string.toString()));
string.setLength(0);
}
@@ -423,7 +425,7 @@ OIdentifierCharacter = [^\r\n\u00A7\\]
{XmlAttribute} {
yybegin(XMLINSTRATTRIB);
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_ATTRIBUTENAME, yytext()));
if(string.length()>0){
if (string.length() > 0){
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT, string.toString()));
string.setLength(0);
}
@@ -432,7 +434,7 @@ OIdentifierCharacter = [^\r\n\u00A7\\]
"{" {
yybegin(YYINITIAL);
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_INSTRATTRNAMEVAR_BEGIN, yytext()));
if(string.length()>0){
if (string.length() > 0){
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT, string.toString()));
string.setLength(0);
}
@@ -441,7 +443,7 @@ OIdentifierCharacter = [^\r\n\u00A7\\]
{XmlInstrEnd} {
yybegin(XML);
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_INSTR_END, yytext()));
if(string.length()>0){
if (string.length() > 0){
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT, string.toString()));
string.setLength(0);
}
@@ -487,19 +489,19 @@ OIdentifierCharacter = [^\r\n\u00A7\\]
string.setLength(0);
return new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_COMMENT, ret);
}
{LineTerminator} { string.append(yytext()); yyline++;}
{LineTerminator} { string.append(yytext()); yyline++;}
.|\n { string.append(yytext());}
}
<XML> {
{XmlCDataStart} {
String ret=string.toString(); string.setLength(0); string.append(yytext() ); yybegin(XMLCDATA);
if(!ret.isEmpty()) return new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT,ret);
String ret = string.toString(); string.setLength(0); string.append(yytext() ); yybegin(XMLCDATA);
if (!ret.isEmpty()) return new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT, ret);
}
{XmlInstrStart} {
yybegin(XMLINSTROPENTAG);
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_INSTR_BEGIN, yytext()));
if(string.length()>0){
if (string.length() > 0){
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT, string.toString()));
string.setLength(0);
}
@@ -508,20 +510,20 @@ OIdentifierCharacter = [^\r\n\u00A7\\]
"<?{" {
yybegin(YYINITIAL);
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_INSTRVARTAG_BEGIN, yytext()));
if(string.length()>0){
if (string.length() > 0){
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT, string.toString()));
string.setLength(0);
}
return lex();
}
{XmlCommentStart} {
String ret=string.toString(); string.setLength(0); string.append(yytext()); yybegin(XMLCOMMENT);
if(!ret.isEmpty()) return new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT,ret);
String ret = string.toString(); string.setLength(0); string.append(yytext()); yybegin(XMLCOMMENT);
if (!ret.isEmpty()) return new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT, ret);
}
{XmlOpenTagStart} {
yybegin(XMLOPENTAG);
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_STARTTAG_BEGIN, yytext()));
if(string.length()>0){
if (string.length() > 0){
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT, string.toString()));
string.setLength(0);
}
@@ -529,7 +531,7 @@ OIdentifierCharacter = [^\r\n\u00A7\\]
}
{XmlCloseTag} {
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_FINISHTAG, yytext()));
if(string.length()>0){
if (string.length() > 0){
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT, string.toString()));
string.setLength(0);
}
@@ -539,7 +541,7 @@ OIdentifierCharacter = [^\r\n\u00A7\\]
"<{" {
yybegin(YYINITIAL);
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_STARTVARTAG_BEGIN, yytext()));
if(string.length()>0){
if (string.length() > 0){
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT, string.toString()));
string.setLength(0);
}
@@ -548,7 +550,7 @@ OIdentifierCharacter = [^\r\n\u00A7\\]
"</{" {
yybegin(YYINITIAL);
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_FINISHVARTAG_BEGIN, yytext()));
if(string.length()>0){
if (string.length() > 0){
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT, string.toString()));
string.setLength(0);
}
@@ -557,7 +559,7 @@ OIdentifierCharacter = [^\r\n\u00A7\\]
"{" {
yybegin(YYINITIAL);
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_VAR_BEGIN, yytext()));
if(string.length()>0){
if (string.length() > 0){
pushback(new ParsedSymbol(SymbolGroup.XML, SymbolType.XML_TEXT, string.toString()));
string.setLength(0);
}

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

@@ -31,10 +31,9 @@ package com.jpexs.decompiler.flash.abc.methodinfo_parser;
%{
StringBuffer string = new StringBuffer();
boolean isMultiname = false;
long multinameId = 0;
StringBuffer string = new StringBuffer();
boolean isMultiname = false;
long multinameId = 0;
/**
* Create an empty lexer, yyrset will be called later to reset and assign
@@ -144,9 +143,9 @@ StringCharacter = [^\r\n\"\\]
\" {
yybegin(YYINITIAL);
// length also includes the trailing quote
if(isMultiname){
if (isMultiname){
return new ParsedSymbol(ParsedSymbol.TYPE_MULTINAME, new Long(multinameId));
}else{
} else {
return new ParsedSymbol(ParsedSymbol.TYPE_STRING, string.toString());
}
}

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

@@ -37,7 +37,7 @@ import com.jpexs.decompiler.flash.ecma.Undefined;
%{
StringBuffer string = new StringBuffer();
StringBuffer string = new StringBuffer();
/**
* Create an empty lexer, yyrset will be called later to reset and assign

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

@@ -1260,6 +1260,7 @@ public final class ActionScriptLexer {
public int yyline() {
return yyline + 1;
}
private final List<LexListener> listeners = new ArrayList<>();
public void addListener(LexListener listener) {
@@ -1287,6 +1288,7 @@ public final class ActionScriptLexer {
last = null;
informListenersPushBack(symb);
}
ParsedSymbol last;
public ParsedSymbol lex() throws java.io.IOException, ActionParseException {

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

@@ -45,6 +45,7 @@ import java.util.Stack;
public int yyline() {
return yyline + 1;
}
private final List<LexListener> listeners = new ArrayList<>();
public void addListener(LexListener listener){
@@ -72,12 +73,13 @@ import java.util.Stack;
last = null;
informListenersPushBack(symb);
}
ParsedSymbol last;
public ParsedSymbol lex() throws java.io.IOException, ActionParseException{
ParsedSymbol ret = null;
if(!pushedBack.isEmpty()){
if (!pushedBack.isEmpty()){
ret = last = pushedBack.pop();
}else{
} else {
ret = last = yylex();
}
informListenersLex(ret);

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

@@ -35,7 +35,6 @@ package com.jpexs.decompiler.flash.tags.text;
boolean finish = false;
String parameterName = null;
/**
* Create an empty lexer, yyrset will be called later to reset and assign
* the reader
@@ -66,7 +65,7 @@ HexDigit = [0-9a-fA-F]
<YYINITIAL> {
"[" {
yybegin(PARAMETER);
if(string != null){
if (string != null){
String ret = string.toString();
string = null;
return new ParsedSymbol(SymbolType.TEXT, ret);

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

@@ -32,7 +32,6 @@ import java.util.Stack;
%{
/**
* Create an empty lexer, yyrset will be called later to reset and assign
* the reader
@@ -57,9 +56,9 @@ import java.util.Stack;
public ConditionToken lex() throws java.io.IOException, AnnotationParseException{
ConditionToken ret = null;
if(!pushedBack.isEmpty()){
if (!pushedBack.isEmpty()){
ret = pushedBack.pop();
}else{
} else {
ret = yylex();
}
return ret;