From 0bdc737c864c6b2f3ab759574f3df3811d5bb5db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= Date: Sun, 28 Apr 2013 17:06:37 +0200 Subject: [PATCH] better text tags editing --- .../jpexs/decompiler/flash/gui/MainFrame.java | 53 +- .../decompiler/flash/tags/DefineFont2Tag.java | 5 + .../decompiler/flash/tags/DefineFont3Tag.java | 5 + .../decompiler/flash/tags/DefineFontTag.java | 5 + .../decompiler/flash/tags/DefineText2Tag.java | 39 +- .../decompiler/flash/tags/DefineTextTag.java | 39 +- .../decompiler/flash/tags/base/FontTag.java | 2 + .../decompiler/flash/tags/text/TextLexer.java | 1432 +++++++++-------- .../jpexs/decompiler/flash/types/RECT.java | 2 +- 9 files changed, 877 insertions(+), 705 deletions(-) diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java index ba085c4c9..d1618b764 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java @@ -86,6 +86,7 @@ import java.awt.CardLayout; import java.awt.Color; import java.awt.Component; import java.awt.Dimension; +import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyAdapter; @@ -104,6 +105,7 @@ import java.util.List; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import javax.swing.BoxLayout; import javax.swing.Icon; import javax.swing.JButton; import javax.swing.JCheckBoxMenuItem; @@ -173,6 +175,9 @@ public class MainFrame extends JFrame implements ActionListener, TreeSelectionLi private JPanel searchPanel; private JCheckBoxMenuItem autoDeobfuscateMenuItem; private JPanel displayWithPreview; + private JButton textSaveButton; + private JButton textEditButton; + private JButton textCancelButton; public void setPercent(int percent) { progressBar.setValue(percent); @@ -484,16 +489,37 @@ public class MainFrame extends JFrame implements ActionListener, TreeSelectionLi List list2 = new ArrayList(); list2.addAll(swf.tags); parseCharacters(list2); - - JPanel textPanel = new JPanel(new BorderLayout()); textPanel.add(textValue, BorderLayout.CENTER); - JButton textSaveButton = new JButton("Save text", View.getIcon("save16")); - textPanel.add(textSaveButton, BorderLayout.EAST); + textValue.setEditable(false); + + JPanel buttonsPanel = new JPanel(); + buttonsPanel.setLayout(new BoxLayout(buttonsPanel, BoxLayout.X_AXIS)); + + + textSaveButton = new JButton("Save", View.getIcon("save16")); + textSaveButton.setMargin(new Insets(3, 3, 3, 10)); textSaveButton.setActionCommand("SAVETEXT"); textSaveButton.addActionListener(this); + textEditButton = new JButton("Edit", View.getIcon("edit16")); + textEditButton.setMargin(new Insets(3, 3, 3, 10)); + textEditButton.setActionCommand("EDITTEXT"); + textEditButton.addActionListener(this); + textCancelButton = new JButton("Cancel", View.getIcon("cancel16")); + textCancelButton.setMargin(new Insets(3, 3, 3, 10)); + textCancelButton.setActionCommand("CANCELTEXT"); + textCancelButton.addActionListener(this); + + buttonsPanel.add(textEditButton); + buttonsPanel.add(textSaveButton); + buttonsPanel.add(textCancelButton); + + textSaveButton.setVisible(false); + textCancelButton.setVisible(false); + + textPanel.add(buttonsPanel, BorderLayout.EAST); displayWithPreview = new JPanel(new CardLayout()); displayWithPreview.add(textPanel, CARDTEXTPANEL); @@ -1063,11 +1089,17 @@ public class MainFrame extends JFrame implements ActionListener, TreeSelectionLi refreshTree(); } } + if (e.getActionCommand().equals("EDITTEXT")) { + setEditText(true); + } + if (e.getActionCommand().equals("CANCELTEXT")) { + setEditText(false); + } if (e.getActionCommand().equals("SAVETEXT")) { if (oldValue instanceof TextTag) { try { ((TextTag) oldValue).setFormattedText(swf.tags, textValue.getText()); - reload(true); + setEditText(false); } catch (ParseException ex) { JOptionPane.showMessageDialog(null, "Invalid text: " + ex.text + " on line " + ex.line, "Error", JOptionPane.ERROR_MESSAGE); } @@ -1477,6 +1509,7 @@ public class MainFrame extends JFrame implements ActionListener, TreeSelectionLi @Override public void valueChanged(TreeSelectionEvent e) { + setEditText(false); reload(false); } @@ -1755,4 +1788,14 @@ public class MainFrame extends JFrame implements ActionListener, TreeSelectionLi objs.addAll(swf.tags); tagTree.setModel(new TagTreeModel(createTagList(objs, null), (new File(Main.file)).getName())); } + + public void setEditText(boolean edit) { + textValue.setEditable(edit); + textSaveButton.setVisible(edit); + textEditButton.setVisible(!edit); + textCancelButton.setVisible(edit); + if (!edit) { + reload(true); + } + } } diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java index d5df36abc..4142ae06c 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java @@ -59,6 +59,11 @@ public class DefineFont2Tag extends CharacterTag implements FontTag { public RECT fontBoundsTable[]; public KERNINGRECORD fontKerningTable[]; + @Override + public int getGlyphWidth(int glyphIndex) { + return glyphShapeTable[glyphIndex].getBounds().getWidth(); + } + @Override public int getGlyphAdvance(int glyphIndex) { if (fontFlagsHasLayout) { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java index 39b99d7b8..60348fa84 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java @@ -57,6 +57,11 @@ public class DefineFont3Tag extends CharacterTag implements FontTag { public RECT fontBoundsTable[]; public KERNINGRECORD fontKerningTable[]; + @Override + public int getGlyphWidth(int glyphIndex) { + return glyphShapeTable[glyphIndex].getBounds().getWidth() / 20; + } + @Override public int getGlyphAdvance(int glyphIndex) { if (fontFlagsHasLayout) { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java index 349cf0756..080e8e405 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontTag.java @@ -41,6 +41,11 @@ public class DefineFontTag extends CharacterTag implements FontTag { @Override public int getGlyphAdvance(int glyphIndex) { + return getGlyphWidth(glyphIndex); + } + + @Override + public int getGlyphWidth(int glyphIndex) { return glyphShapeTable[glyphIndex].getBounds().getWidth(); } diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java index 087e4021c..ec826723a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java @@ -122,15 +122,19 @@ public class DefineText2Tag extends CharacterTag implements BoundedTag, TextTag try { TextLexer lexer = new TextLexer(new InputStreamReader(new ByteArrayInputStream(text.getBytes("UTF-8")), "UTF-8")); ParsedSymbol s = null; - textRecords = new ArrayList(); + List textRecords = new ArrayList(); RGBA colorA = null; int fontId = -1; int textHeight = -1; FontTag font = null; Integer x = null; Integer y = null; - glyphBits = 0; - advanceBits = 0; + int currentX = 0; + int currentY = 0; + int glyphBits = 0; + int advanceBits = 0; + int maxX = Integer.MIN_VALUE; + int minX = Integer.MAX_VALUE; while ((s = lexer.yylex()) != null) { switch (s.type) { case COLOR: @@ -153,9 +157,17 @@ public class DefineText2Tag extends CharacterTag implements BoundedTag, TextTag break; case X: x = (Integer) s.values[0]; + currentX = x; + if (currentX < minX) { + minX = currentX; + } + if (currentX > maxX) { + maxX = currentX; + } break; case Y: y = (Integer) s.values[0]; + currentY = y; break; case TEXT: if (font == null) { @@ -189,10 +201,20 @@ public class DefineText2Tag extends CharacterTag implements BoundedTag, TextTag char c = txt.charAt(i); tr.glyphEntries[i] = new GLYPHENTRY(); tr.glyphEntries[i].glyphIndex = font.charToGlyph(tags, c); + + + if (tr.glyphEntries[i].glyphIndex == -1) { throw new ParseException("Font does not contain glyph for character '" + c + "'", lexer.yyline()); } tr.glyphEntries[i].glyphAdvance = textHeight * font.getGlyphAdvance(tr.glyphEntries[i].glyphIndex) / 1024; + + int gw = textHeight * font.getGlyphWidth(tr.glyphEntries[i].glyphIndex) / 1024; + if (i == 0) { + currentX += gw; + } else { + currentX += tr.glyphEntries[i].glyphAdvance; + } if (SWFOutputStream.getNeededBitsS(tr.glyphEntries[i].glyphIndex) > glyphBits) { glyphBits = SWFOutputStream.getNeededBitsS(tr.glyphEntries[i].glyphIndex); } @@ -202,10 +224,21 @@ public class DefineText2Tag extends CharacterTag implements BoundedTag, TextTag } textRecords.add(tr); + if (currentX > maxX) { + maxX = currentX; + } + if (currentX < minX) { + minX = currentX; + } break; } } + this.advanceBits = advanceBits; + this.glyphBits = glyphBits; + this.textRecords = textRecords; + this.textBounds.Xmin = minX; + this.textBounds.Xmax = maxX; } catch (UnsupportedEncodingException ex) { Logger.getLogger(MainFrame.class.getName()).log(Level.SEVERE, null, ex); } catch (IOException ex) { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java index b3c159b15..f59456d0b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java @@ -117,15 +117,19 @@ public class DefineTextTag extends CharacterTag implements BoundedTag, TextTag { try { TextLexer lexer = new TextLexer(new InputStreamReader(new ByteArrayInputStream(text.getBytes("UTF-8")), "UTF-8")); ParsedSymbol s = null; - textRecords = new ArrayList(); + List textRecords = new ArrayList(); RGB color = null; int fontId = -1; int textHeight = -1; FontTag font = null; Integer x = null; Integer y = null; - glyphBits = 0; - advanceBits = 0; + int currentX = 0; + int currentY = 0; + int glyphBits = 0; + int advanceBits = 0; + int maxX = Integer.MIN_VALUE; + int minX = Integer.MAX_VALUE; while ((s = lexer.yylex()) != null) { switch (s.type) { case COLOR: @@ -148,9 +152,17 @@ public class DefineTextTag extends CharacterTag implements BoundedTag, TextTag { break; case X: x = (Integer) s.values[0]; + currentX = x; + if (currentX < minX) { + minX = currentX; + } + if (currentX > maxX) { + maxX = currentX; + } break; case Y: y = (Integer) s.values[0]; + currentY = y; break; case TEXT: if (font == null) { @@ -184,10 +196,20 @@ public class DefineTextTag extends CharacterTag implements BoundedTag, TextTag { char c = txt.charAt(i); tr.glyphEntries[i] = new GLYPHENTRY(); tr.glyphEntries[i].glyphIndex = font.charToGlyph(tags, c); + + + if (tr.glyphEntries[i].glyphIndex == -1) { throw new ParseException("Font does not contain glyph for character '" + c + "'", lexer.yyline()); } tr.glyphEntries[i].glyphAdvance = textHeight * font.getGlyphAdvance(tr.glyphEntries[i].glyphIndex) / 1024; + + int gw = textHeight * font.getGlyphWidth(tr.glyphEntries[i].glyphIndex) / 1024; + if (i == 0) { + currentX += gw; + } else { + currentX += tr.glyphEntries[i].glyphAdvance; + } if (SWFOutputStream.getNeededBitsS(tr.glyphEntries[i].glyphIndex) > glyphBits) { glyphBits = SWFOutputStream.getNeededBitsS(tr.glyphEntries[i].glyphIndex); } @@ -197,10 +219,21 @@ public class DefineTextTag extends CharacterTag implements BoundedTag, TextTag { } textRecords.add(tr); + if (currentX > maxX) { + maxX = currentX; + } + if (currentX < minX) { + minX = currentX; + } break; } } + this.advanceBits = advanceBits; + this.glyphBits = glyphBits; + this.textRecords = textRecords; + this.textBounds.Xmin = minX; + this.textBounds.Xmax = maxX; } catch (UnsupportedEncodingException ex) { Logger.getLogger(MainFrame.class.getName()).log(Level.SEVERE, null, ex); } catch (IOException ex) { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/base/FontTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/base/FontTag.java index 50c8c9048..25256d295 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/base/FontTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/FontTag.java @@ -35,4 +35,6 @@ public interface FontTag extends AloneTag { public int charToGlyph(List tags, char c); public int getGlyphAdvance(int glyphIndex); + + public int getGlyphWidth(int glyphIndex); } diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java b/trunk/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java index 6261391e9..bb95d691b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java @@ -1,273 +1,274 @@ /* The following code was generated by JFlex 1.4.3 on 28.4.13 11:46 */ /* Flash assembler language lexer specification */ - package com.jpexs.decompiler.flash.tags.text; import java.util.regex.*; - /** - * This class is a scanner generated by - * JFlex 1.4.3 - * on 28.4.13 11:46 from the specification file + * This class is a scanner generated by + * JFlex 1.4.3 on 28.4.13 11:46 from the + * specification file * D:/Dokumenty/Programovani/JavaSE/FFDec/trunk/src/com/jpexs/decompiler/flash/tags/text/text.flex */ public final class TextLexer { - /** 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; + /** + * lexical states + */ + public static final int YYINITIAL = 0; + /** + * 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 + }; + /** + * Translates characters to character classes + */ + private static final String ZZ_CMAP_PACKED = + "\12\0\1\32\25\0\1\12\1\0\1\30\1\23\3\0\1\31\5\0" + + "\1\3\2\0\1\1\11\2\41\0\1\5\1\26\1\17\3\0\1\4" + + "\1\27\1\20\1\4\1\14\1\6\1\16\1\13\1\15\2\0\1\21" + + "\1\0\1\10\1\7\2\0\1\22\1\0\1\11\3\0\1\24\1\25" + + "\uff86\0"; + /** + * 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(); + private static final String ZZ_ACTION_PACKED_0 = + "\1\0\3\1\1\2\4\0\1\3\1\4\1\5\1\6" + + "\1\7\1\10\1\11\1\12\1\13\1\14\1\15\16\0" + + "\1\16\1\17\25\0\1\20\3\0\1\21"; - /** initial size of the lookahead buffer */ - private static final int ZZ_BUFFERSIZE = 16384; - - /** lexical states */ - public static final int YYINITIAL = 0; - - /** - * 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 - }; - - /** - * Translates characters to character classes - */ - private static final String ZZ_CMAP_PACKED = - "\12\0\1\32\25\0\1\12\1\0\1\30\1\23\3\0\1\31\5\0"+ - "\1\3\2\0\1\1\11\2\41\0\1\5\1\26\1\17\3\0\1\4"+ - "\1\27\1\20\1\4\1\14\1\6\1\16\1\13\1\15\2\0\1\21"+ - "\1\0\1\10\1\7\2\0\1\22\1\0\1\11\3\0\1\24\1\25"+ - "\uff86\0"; - - /** - * 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(); - - private static final String ZZ_ACTION_PACKED_0 = - "\1\0\3\1\1\2\4\0\1\3\1\4\1\5\1\6"+ - "\1\7\1\10\1\11\1\12\1\13\1\14\1\15\16\0"+ - "\1\16\1\17\25\0\1\20\3\0\1\21"; - - private static int [] zzUnpackAction() { - int [] result = new int[62]; - 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); + private static int[] zzUnpackAction() { + int[] result = new int[62]; + int offset = 0; + offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); + return result; } - 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\33\0\66\0\121\0\33\0\154\0\207\0\242"+ - "\0\275\0\33\0\33\0\33\0\33\0\33\0\33\0\33"+ - "\0\33\0\33\0\33\0\33\0\330\0\363\0\u010e\0\u0129"+ - "\0\u0144\0\u015f\0\u017a\0\u0195\0\u01b0\0\u01cb\0\u01e6\0\u0201"+ - "\0\u021c\0\u0237\0\33\0\33\0\u0252\0\u026d\0\u0288\0\u02a3"+ - "\0\u02be\0\u02d9\0\u02f4\0\u030f\0\u032a\0\u0345\0\u0360\0\u037b"+ - "\0\u0396\0\u03b1\0\u03cc\0\u03e7\0\u0402\0\u041d\0\u0438\0\u0453"+ - "\0\u046e\0\33\0\u0489\0\u04a4\0\u04bf\0\33"; - - private static int [] zzUnpackRowMap() { - int [] result = new int[62]; - 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++); + 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; } - 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\33\0\66\0\121\0\33\0\154\0\207\0\242" + + "\0\275\0\33\0\33\0\33\0\33\0\33\0\33\0\33" + + "\0\33\0\33\0\33\0\33\0\330\0\363\0\u010e\0\u0129" + + "\0\u0144\0\u015f\0\u017a\0\u0195\0\u01b0\0\u01cb\0\u01e6\0\u0201" + + "\0\u021c\0\u0237\0\33\0\33\0\u0252\0\u026d\0\u0288\0\u02a3" + + "\0\u02be\0\u02d9\0\u02f4\0\u030f\0\u032a\0\u0345\0\u0360\0\u037b" + + "\0\u0396\0\u03b1\0\u03cc\0\u03e7\0\u0402\0\u041d\0\u0438\0\u0453" + + "\0\u046e\0\33\0\u0489\0\u04a4\0\u04bf\0\33"; - /** - * The transition table of the DFA - */ - private static final int [] ZZ_TRANS = zzUnpackTrans(); - - private static final String ZZ_TRANS_PACKED_0 = - "\5\2\1\3\20\2\1\4\3\2\1\5\41\0\1\6"+ - "\11\0\1\7\3\0\1\10\1\11\5\0\5\12\1\13"+ - "\1\14\1\12\1\15\1\16\5\12\1\17\2\12\1\20"+ - "\3\12\1\21\1\22\1\23\1\24\10\0\1\25\32\0"+ - "\1\26\35\0\1\27\32\0\1\30\30\0\1\31\43\0"+ - "\1\32\12\0\1\33\1\34\1\35\30\0\1\36\1\37"+ - "\1\40\40\0\1\41\30\0\1\42\42\0\1\43\14\0"+ - "\2\34\14\0\1\43\14\0\1\33\1\34\47\0\1\44"+ - "\14\0\2\37\14\0\1\44\14\0\1\36\1\37\42\0"+ - "\1\45\42\0\1\46\11\0\1\47\1\50\42\0\1\51"+ - "\32\0\1\52\21\0\2\50\7\0\1\52\43\0\1\53"+ - "\22\0\1\54\20\0\2\55\1\0\1\55\1\0\1\55"+ - "\5\0\1\55\3\0\1\55\6\0\1\55\17\0\1\56"+ - "\17\0\2\57\1\0\1\57\1\0\1\57\5\0\1\57"+ - "\3\0\1\57\6\0\1\57\20\0\1\60\16\0\2\61"+ - "\1\0\1\61\1\0\1\61\5\0\1\61\3\0\1\61"+ - "\6\0\1\61\21\0\1\62\15\0\2\63\1\0\1\63"+ - "\1\0\1\63\5\0\1\63\3\0\1\63\6\0\1\63"+ - "\16\0\1\64\20\0\2\65\1\0\1\65\1\0\1\65"+ - "\5\0\1\65\3\0\1\65\6\0\1\65\14\0\1\66"+ - "\22\0\2\67\1\0\1\67\1\0\1\67\5\0\1\67"+ - "\3\0\1\67\6\0\1\67\15\0\1\70\21\0\2\71"+ - "\1\0\1\71\1\0\1\71\5\0\1\71\2\0\1\72"+ - "\1\71\6\0\1\71\4\0\1\73\1\74\31\0\2\75"+ - "\1\0\1\75\1\0\1\75\5\0\1\75\3\0\1\75"+ - "\6\0\1\75\22\0\1\76\14\0\2\74\14\0\1\76"+ - "\32\0\1\72\13\0"; - - private static int [] zzUnpackTrans() { - int [] result = new int[1242]; - 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); + private static int[] zzUnpackRowMap() { + int[] result = new int[62]; + int offset = 0; + offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); + return result; } - 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 = - "\1\0\1\11\2\1\1\11\4\0\13\11\16\0\2\11"+ - "\25\0\1\11\3\0\1\11"; - - private static int [] zzUnpackAttribute() { - int [] result = new int[62]; - 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); + 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; } - return j; - } + /** + * The transition table of the DFA + */ + private static final int[] ZZ_TRANS = zzUnpackTrans(); + private static final String ZZ_TRANS_PACKED_0 = + "\5\2\1\3\20\2\1\4\3\2\1\5\41\0\1\6" + + "\11\0\1\7\3\0\1\10\1\11\5\0\5\12\1\13" + + "\1\14\1\12\1\15\1\16\5\12\1\17\2\12\1\20" + + "\3\12\1\21\1\22\1\23\1\24\10\0\1\25\32\0" + + "\1\26\35\0\1\27\32\0\1\30\30\0\1\31\43\0" + + "\1\32\12\0\1\33\1\34\1\35\30\0\1\36\1\37" + + "\1\40\40\0\1\41\30\0\1\42\42\0\1\43\14\0" + + "\2\34\14\0\1\43\14\0\1\33\1\34\47\0\1\44" + + "\14\0\2\37\14\0\1\44\14\0\1\36\1\37\42\0" + + "\1\45\42\0\1\46\11\0\1\47\1\50\42\0\1\51" + + "\32\0\1\52\21\0\2\50\7\0\1\52\43\0\1\53" + + "\22\0\1\54\20\0\2\55\1\0\1\55\1\0\1\55" + + "\5\0\1\55\3\0\1\55\6\0\1\55\17\0\1\56" + + "\17\0\2\57\1\0\1\57\1\0\1\57\5\0\1\57" + + "\3\0\1\57\6\0\1\57\20\0\1\60\16\0\2\61" + + "\1\0\1\61\1\0\1\61\5\0\1\61\3\0\1\61" + + "\6\0\1\61\21\0\1\62\15\0\2\63\1\0\1\63" + + "\1\0\1\63\5\0\1\63\3\0\1\63\6\0\1\63" + + "\16\0\1\64\20\0\2\65\1\0\1\65\1\0\1\65" + + "\5\0\1\65\3\0\1\65\6\0\1\65\14\0\1\66" + + "\22\0\2\67\1\0\1\67\1\0\1\67\5\0\1\67" + + "\3\0\1\67\6\0\1\67\15\0\1\70\21\0\2\71" + + "\1\0\1\71\1\0\1\71\5\0\1\71\2\0\1\72" + + "\1\71\6\0\1\71\4\0\1\73\1\74\31\0\2\75" + + "\1\0\1\75\1\0\1\75\5\0\1\75\3\0\1\75" + + "\6\0\1\75\22\0\1\76\14\0\2\74\14\0\1\76" + + "\32\0\1\72\13\0"; - /** the input device */ - private java.io.Reader zzReader; + private static int[] zzUnpackTrans() { + int[] result = new int[1242]; + int offset = 0; + offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); + return result; + } - /** the current state of the DFA */ - private int zzState; + 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; - /** the current lexical state */ - private int zzLexicalState = YYINITIAL; + /* 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 = + "\1\0\1\11\2\1\1\11\4\0\13\11\16\0\2\11" + + "\25\0\1\11\3\0\1\11"; - /** this buffer contains the current text to be matched and is - the source of the yytext() string */ - private char zzBuffer[] = new char[ZZ_BUFFERSIZE]; + private static int[] zzUnpackAttribute() { + int[] result = new int[62]; + int offset = 0; + offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); + return result; + } - /** 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 = null; - boolean finish=false; + 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 = null; + boolean finish = false; /** * Create an empty lexer, yyrset will be called later to reset and assign * the reader */ public TextLexer() { - } public int yychar() { @@ -275,481 +276,526 @@ public final class TextLexer { } public int yyline() { - return yyline+1; + return yyline + 1; } - - - /** - * 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 TextLexer(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 TextLexer(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 < 82) { - 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 a java.io.InputStream version of this + * constructor. + * + * @param in the java.io.Reader to read input from. + */ + public TextLexer(java.io.Reader in) { + this.zzReader = 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; + /** + * 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 TextLexer(java.io.InputStream in) { + this(new java.io.InputStreamReader(in)); } - /* finally: fill the buffer with new input */ - int numRead = zzReader.read(zzBuffer, zzEndRead, - zzBuffer.length-zzEndRead); - - if (numRead > 0) { - zzEndRead+= numRead; - return false; + /** + * 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 < 82) { + int count = packed.charAt(i++); + char value = packed.charAt(i++); + do { + map[j++] = value; + } while (--count > 0); + } + return map; } - // unlikely but not impossible: read 0 characters, but not at end of stream - if (numRead == 0) { - int c = zzReader.read(); - if (c == -1) { + + /** + * 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; + } + + /* 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 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(); - } - - - /** - * 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]; - } - - 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 - * @exception java.io.IOException if any I/O-Error occurs - */ - public ParsedSymbol yylex() throws java.io.IOException, ParseException { - 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; - - boolean zzR = false; - for (zzCurrentPosL = zzStartRead; zzCurrentPosL < zzMarkedPosL; - zzCurrentPosL++) { - switch (zzBufferL[zzCurrentPosL]) { - case '\u000B': - case '\u000C': - case '\u0085': - case '\u2028': - case '\u2029': - yyline++; - yycolumn = 0; - zzR = false; - break; - case '\r': - yyline++; - yycolumn = 0; - zzR = true; - break; - case '\n': - if (zzR) - zzR = false; - else { - yyline++; - yycolumn = 0; - } - break; - default: - zzR = false; - yycolumn++; + if (zzReader != null) { + zzReader.close(); } - } + } - if (zzR) { - // peek one character ahead if it is \n (if we have counted one line too much) - boolean zzPeek; - if (zzMarkedPosL < zzEndReadL) - zzPeek = zzBufferL[zzMarkedPosL] == '\n'; - else if (zzAtEOF) - zzPeek = false; - else { - boolean eof = zzRefill(); - zzEndReadL = zzEndRead; - zzMarkedPosL = zzMarkedPos; - zzBufferL = zzBuffer; - if (eof) - zzPeek = false; - else - zzPeek = zzBufferL[zzMarkedPosL] == '\n'; + /** + * 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]; } - if (zzPeek) yyline--; - } - zzAction = -1; - zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL; - - zzState = ZZ_LEXSTATE[zzLexicalState]; + 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 + * @exception java.io.IOException if any I/O-Error occurs + */ + public ParsedSymbol yylex() throws java.io.IOException, ParseException { + 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) { - - 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; + zzMarkedPosL = zzMarkedPos; - int zzAttributes = zzAttrL[zzState]; - if ( (zzAttributes & 1) == 1 ) { - zzAction = zzState; - zzMarkedPosL = zzCurrentPosL; - if ( (zzAttributes & 8) == 8 ) break zzForAction; - } + yychar += zzMarkedPosL - zzStartRead; + boolean zzR = false; + for (zzCurrentPosL = zzStartRead; zzCurrentPosL < zzMarkedPosL; + zzCurrentPosL++) { + switch (zzBufferL[zzCurrentPosL]) { + case '\u000B': + case '\u000C': + case '\u0085': + case '\u2028': + case '\u2029': + yyline++; + yycolumn = 0; + zzR = false; + break; + case '\r': + yyline++; + yycolumn = 0; + zzR = true; + break; + case '\n': + if (zzR) { + zzR = false; + } else { + yyline++; + yycolumn = 0; + } + break; + default: + zzR = false; + yycolumn++; + } + } + + if (zzR) { + // peek one character ahead if it is \n (if we have counted one line too much) + boolean zzPeek; + if (zzMarkedPosL < zzEndReadL) { + zzPeek = zzBufferL[zzMarkedPosL] == '\n'; + } else if (zzAtEOF) { + zzPeek = false; + } else { + boolean eof = zzRefill(); + zzEndReadL = zzEndRead; + zzMarkedPosL = zzMarkedPos; + zzBufferL = zzBuffer; + if (eof) { + zzPeek = false; + } else { + zzPeek = zzBufferL[zzMarkedPosL] == '\n'; + } + } + if (zzPeek) { + yyline--; + } + } + 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; + } + } + + } + } + + // store back cached position + zzMarkedPos = zzMarkedPosL; + + switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { + case 1: { + if (string == null) { + string = new StringBuffer(); + } + string.append(yytext()); + } + case 18: + break; + case 3: { + throw new ParseException("Illegal escape sequence \"" + yytext() + "\"", yyline + 1); + } + case 19: + break; + case 6: { + if (string == null) { + string = new StringBuffer(); + } + string.append('\n'); + } + case 20: + break; + case 11: { + if (string == null) { + string = new StringBuffer(); + } + string.append('\b'); + } + case 21: + break; + case 17: { + if (string == null) { + Pattern pat = Pattern.compile("\\[font ([0-9]+) height ([0-9]+)\\]"); + Matcher m = pat.matcher(yytext()); + if (m.matches()) { + return new ParsedSymbol(SymbolType.FONT, Integer.parseInt(m.group(1)), Integer.parseInt(m.group(2))); + } + } else { + yypushback(yylength()); + String ret = string.toString(); + string = null; + return new ParsedSymbol(SymbolType.TEXT, ret.toString()); + } + } + case 22: + break; + case 13: { + if (string == null) { + string = new StringBuffer(); + } + string.append('\''); + } + case 23: + break; + case 16: { + if (string == null) { + return new ParsedSymbol(SymbolType.COLOR, yytext().substring(8, yytext().length() - 1)); + } else { + yypushback(yylength()); + String ret = string.toString(); + string = null; + return new ParsedSymbol(SymbolType.TEXT, ret.toString()); + } + } + case 24: + break; + case 8: { + if (string == null) { + string = new StringBuffer(); + } + string.append(']'); + } + case 25: + break; + case 15: { + if (string == null) { + return new ParsedSymbol(SymbolType.Y, Integer.parseInt(yytext().substring(3, yytext().length() - 1))); + } else { + yypushback(yylength()); + String ret = string.toString(); + string = null; + return new ParsedSymbol(SymbolType.TEXT, ret.toString()); + } + } + case 26: + break; + case 14: { + if (string == null) { + return new ParsedSymbol(SymbolType.X, Integer.parseInt(yytext().substring(3, yytext().length() - 1))); + } else { + yypushback(yylength()); + String ret = string.toString(); + string = null; + return new ParsedSymbol(SymbolType.TEXT, ret.toString()); + } + } + case 27: + break; + case 7: { + if (string == null) { + string = new StringBuffer(); + } + string.append('\t'); + } + case 28: + break; + case 4: { + if (string == null) { + string = new StringBuffer(); + } + string.append('['); + } + case 29: + break; + case 10: { + if (string == null) { + string = new StringBuffer(); + } + string.append('\\'); + } + case 30: + break; + case 12: { + if (string == null) { + string = new StringBuffer(); + } + string.append('\"'); + } + case 31: + break; + case 9: { + if (string == null) { + string = new StringBuffer(); + } + string.append('\r'); + } + case 32: + break; + case 5: { + if (string == null) { + string = new StringBuffer(); + } + string.append('\f'); + } + case 33: + break; + case 2: { + } + case 34: + break; + default: + if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { + zzAtEOF = true; + switch (zzLexicalState) { + case YYINITIAL: { + if (finish) { + return null; + } else { + finish = true; + return new ParsedSymbol(SymbolType.TEXT, string.toString()); + } + } + case 63: + break; + default: { + return null; + } + } + } else { + zzScanError(ZZ_NO_MATCH); + } + } } - } - - // store back cached position - zzMarkedPos = zzMarkedPosL; - - switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) { - case 1: - { if(string==null) string=new StringBuffer(); string.append( yytext() ); - } - case 18: break; - case 3: - { throw new ParseException("Illegal escape sequence \""+yytext()+"\"",yyline+1); - } - case 19: break; - case 6: - { if(string==null) string=new StringBuffer(); string.append( '\n' ); - } - case 20: break; - case 11: - { if(string==null) string=new StringBuffer(); string.append( '\b' ); - } - case 21: break; - case 17: - { if(string==null){ - Pattern pat = Pattern.compile("\\[font ([0-9]+) height ([0-9]+)\\]"); - Matcher m=pat.matcher(yytext()); - if(m.matches()){ - return new ParsedSymbol(SymbolType.FONT,Integer.parseInt(m.group(1)),Integer.parseInt(m.group(2))); - } - }else{ - yypushback(yylength()); - String ret=string.toString(); - string = null; - return new ParsedSymbol(SymbolType.TEXT,ret.toString()); - } - } - case 22: break; - case 13: - { if(string==null) string=new StringBuffer(); string.append( '\'' ); - } - case 23: break; - case 16: - { if(string==null){ - return new ParsedSymbol(SymbolType.COLOR,yytext().substring(8,yytext().length()-1)); - }else{ - yypushback(yylength()); - String ret=string.toString(); - string = null; - return new ParsedSymbol(SymbolType.TEXT,ret.toString()); - } - } - case 24: break; - case 8: - { if(string==null) string=new StringBuffer(); string.append( ']' ); - } - case 25: break; - case 15: - { if(string==null){ - return new ParsedSymbol(SymbolType.Y,Integer.parseInt(yytext().substring(3,yytext().length()-1))); - }else{ - yypushback(yylength()); - String ret=string.toString(); - string = null; - return new ParsedSymbol(SymbolType.TEXT,ret.toString()); - } - } - case 26: break; - case 14: - { if(string==null){ - return new ParsedSymbol(SymbolType.X,Integer.parseInt(yytext().substring(3,yytext().length()-1))); - }else{ - yypushback(yylength()); - String ret=string.toString(); - string = null; - return new ParsedSymbol(SymbolType.TEXT,ret.toString()); - } - } - case 27: break; - case 7: - { if(string==null) string=new StringBuffer(); string.append( '\t' ); - } - case 28: break; - case 4: - { if(string==null) string=new StringBuffer(); string.append( '[' ); - } - case 29: break; - case 10: - { if(string==null) string=new StringBuffer(); string.append( '\\' ); - } - case 30: break; - case 12: - { if(string==null) string=new StringBuffer(); string.append( '\"' ); - } - case 31: break; - case 9: - { if(string==null) string=new StringBuffer(); string.append( '\r' ); - } - case 32: break; - case 5: - { if(string==null) string=new StringBuffer(); string.append( '\f' ); - } - case 33: break; - case 2: - { - } - case 34: break; - default: - if (zzInput == YYEOF && zzStartRead == zzCurrentPos) { - zzAtEOF = true; - switch (zzLexicalState) { - case YYINITIAL: { - if(finish){return null;}else{finish=true; return new ParsedSymbol(SymbolType.TEXT,string.toString());} - } - case 63: break; - default: - { - return null; - } - } - } - else { - zzScanError(ZZ_NO_MATCH); - } - } } - } - - } diff --git a/trunk/src/com/jpexs/decompiler/flash/types/RECT.java b/trunk/src/com/jpexs/decompiler/flash/types/RECT.java index 5d965c020..80e59f51a 100644 --- a/trunk/src/com/jpexs/decompiler/flash/types/RECT.java +++ b/trunk/src/com/jpexs/decompiler/flash/types/RECT.java @@ -53,7 +53,7 @@ public class RECT { @Override public String toString() { - return "[RECT x=" + Xmin + "-" + Xmax + ", y=" + Ymin + "-" + Ymax + "]"; + return "[RECT x=" + Xmin + " to " + Xmax + ", y=" + Ymin + " to " + Ymax + "]"; } public int getWidth() {