From ee11a7e03f47f8e9f66e5de481b12e48476e6e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=F8=EDk?= Date: Wed, 1 May 2013 11:29:22 +0200 Subject: [PATCH] better text editing top labels for flash preview and parameters edit --- .../jpexs/decompiler/flash/gui/MainFrame.java | 63 +- .../flash/tags/DefineEditTextTag.java | 24 +- .../decompiler/flash/tags/DefineText2Tag.java | 26 +- .../decompiler/flash/tags/DefineTextTag.java | 26 +- .../decompiler/flash/tags/text/TextLexer.java | 1326 ++++++++--------- .../decompiler/flash/tags/text/text.flex | 7 +- 6 files changed, 732 insertions(+), 740 deletions(-) diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java index ff08cb88f..5c5e5450f 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java @@ -23,6 +23,7 @@ import com.jpexs.decompiler.flash.SWFOutputStream; import com.jpexs.decompiler.flash.abc.gui.ABCPanel; import com.jpexs.decompiler.flash.abc.gui.ClassesListTreeModel; import com.jpexs.decompiler.flash.abc.gui.DeobfuscationDialog; +import com.jpexs.decompiler.flash.abc.gui.LineMarkedEditorPane; import com.jpexs.decompiler.flash.abc.gui.TreeElement; import com.jpexs.decompiler.flash.abc.gui.TreeLeafScript; import com.jpexs.decompiler.flash.abc.types.traits.Trait; @@ -86,6 +87,7 @@ import java.awt.CardLayout; import java.awt.Color; import java.awt.Component; import java.awt.Dimension; +import java.awt.FlowLayout; import java.awt.Insets; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -109,6 +111,8 @@ import javax.swing.BoxLayout; import javax.swing.Icon; import javax.swing.JButton; import javax.swing.JCheckBoxMenuItem; +import javax.swing.JComponent; +import javax.swing.JEditorPane; import javax.swing.JFileChooser; import javax.swing.JFrame; import javax.swing.JLabel; @@ -122,11 +126,13 @@ import javax.swing.JProgressBar; import javax.swing.JScrollPane; import javax.swing.JSplitPane; import javax.swing.JTabbedPane; +import javax.swing.JTextArea; import javax.swing.JTextField; import javax.swing.JTree; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.SwingWorker; +import javax.swing.UIManager; import javax.swing.border.BevelBorder; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; @@ -164,7 +170,7 @@ public class MainFrame extends JFrame implements ActionListener, TreeSelectionLi final static String DETAILCARDAS3NAVIGATOR = "Traits list"; final static String DETAILCARDEMPTYPANEL = "Empty card"; final static String CARDTEXTPANEL = "Text card"; - private JTextField textValue = new JTextField(""); + private LineMarkedEditorPane textValue; private JPEGTablesTag jtt; private HashMap characters; private List abcList; @@ -178,6 +184,8 @@ public class MainFrame extends JFrame implements ActionListener, TreeSelectionLi private JButton textSaveButton; private JButton textEditButton; private JButton textCancelButton; + private JPanel parametersPanel; + private JSplitPane previewSplitPane; public void setPercent(int percent) { progressBar.setValue(percent); @@ -490,9 +498,10 @@ public class MainFrame extends JFrame implements ActionListener, TreeSelectionLi list2.addAll(swf.tags); parseCharacters(list2); JPanel textTopPanel = new JPanel(new BorderLayout()); - textTopPanel.add(textValue, BorderLayout.CENTER); - textValue.setEditable(false); - + textValue = new LineMarkedEditorPane(); + textTopPanel.add(new JScrollPane(textValue), BorderLayout.CENTER); + textValue.setEditable(false); + //textValue.setFont(UIManager.getFont("TextField.font")); /*JPanel textBottomPanel = new JPanel(); textBottomPanel.setLayout(new BoxLayout(textBottomPanel, BoxLayout.X_AXIS)); @@ -508,7 +517,7 @@ public class MainFrame extends JFrame implements ActionListener, TreeSelectionLi JPanel buttonsPanel = new JPanel(); - buttonsPanel.setLayout(new BoxLayout(buttonsPanel, BoxLayout.X_AXIS)); + buttonsPanel.setLayout(new FlowLayout()); textSaveButton = new JButton("Save", View.getIcon("save16")); @@ -533,7 +542,7 @@ public class MainFrame extends JFrame implements ActionListener, TreeSelectionLi textSaveButton.setVisible(false); textCancelButton.setVisible(false); - textTopPanel.add(buttonsPanel, BorderLayout.EAST); + textTopPanel.add(buttonsPanel, BorderLayout.SOUTH); displayWithPreview = new JPanel(new CardLayout()); @@ -544,25 +553,50 @@ public class MainFrame extends JFrame implements ActionListener, TreeSelectionLi //textPanel.add(textBottomPanel); displayWithPreview.add(textPanel, CARDTEXTPANEL); - displayWithPreview.setVisible(false); + //displayWithPreview.setVisible(false); + - JPanel panWithPreview = new JPanel(new BorderLayout()); - panWithPreview.add(displayWithPreview, BorderLayout.SOUTH); + + + Component leftComponent = null; try { flashPanel = new FlashPlayerPanel(this); } catch (FlashUnsupportedException fue) { } displayPanel = new JPanel(new CardLayout()); - displayPanel.add(panWithPreview, CARDFLASHPANEL); + if (flashPanel != null) { - panWithPreview.add(flashPanel, BorderLayout.CENTER); + leftComponent=flashPanel; } else { JPanel swtPanel = new JPanel(new BorderLayout()); swtPanel.add(new JLabel("
Preview of this object is not available on this platform. (Windows only)
", JLabel.CENTER), BorderLayout.CENTER); swtPanel.setBackground(Color.white); - panWithPreview.add(swtPanel, BorderLayout.CENTER); + leftComponent = swtPanel; } + + textValue.setContentType("text/swf_text"); + + previewSplitPane=new JSplitPane(JSplitPane.HORIZONTAL_SPLIT); + previewSplitPane.setDividerLocation(300); + JPanel pan=new JPanel(new BorderLayout()); + JLabel prevLabel=new JLabel("SWF preview"); + prevLabel.setHorizontalAlignment(SwingConstants.CENTER); + prevLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); + + JLabel paramsLabel=new JLabel("Parameters"); + paramsLabel.setHorizontalAlignment(SwingConstants.CENTER); + paramsLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); + pan.add(prevLabel,BorderLayout.NORTH); + pan.add(leftComponent,BorderLayout.CENTER); + previewSplitPane.setLeftComponent(pan); + + parametersPanel=new JPanel(new BorderLayout()); + parametersPanel.add(paramsLabel,BorderLayout.NORTH); + parametersPanel.add(displayWithPreview,BorderLayout.CENTER); + previewSplitPane.setRightComponent(parametersPanel); + parametersPanel.setVisible(false); + displayPanel.add(previewSplitPane, CARDFLASHPANEL); imagePanel = new ImagePanel(); displayPanel.add(imagePanel, CARDIMAGEPANEL); displayPanel.add(new JPanel(), CARDEMPTYPANEL); @@ -1799,11 +1833,12 @@ public class MainFrame extends JFrame implements ActionListener, TreeSelectionLi } if (tagObj instanceof TextTag) { - displayWithPreview.setVisible(true); + parametersPanel.setVisible(true); + previewSplitPane.setDividerLocation(previewSplitPane.getWidth()/2); showDetailWithPreview(CARDTEXTPANEL); textValue.setText(((TextTag) tagObj).getFormattedText(swf.tags)); } else { - displayWithPreview.setVisible(false); + parametersPanel.setVisible(false); } } else { diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java index 7faecf89e..5447a7654 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineEditTextTag.java @@ -130,18 +130,18 @@ public class DefineEditTextTag extends CharacterTag implements BoundedTag, TextT String ret = ""; ret += "["; String[] alignValues = {"left", "right", "center", "justify"}; - ret += "xmin " + bounds.Xmin + " ymin " + bounds.Ymin + " xmax " + bounds.Xmax + " ymax " + bounds.Ymax + " "; - ret += (wordWrap ? "wordwrap 1 " : "") + (multiline ? "multiline 1 " : "") - + (password ? "password 1 " : "") + (readOnly ? "readonly 1 " : "") - + (autoSize ? "autosize 1 " : "") + (noSelect ? "noselect 1 " : "") - + (border ? "border 1 " : "") + (wasStatic ? "wasstatic 1 " : "") - + (html ? "html 1 " : "") + (useOutlines ? "useoutlines 1 " : "") - + (hasFont ? "font " + fontId + " " : "") + (hasTextColor ? "color " + textColor.toHexARGB() + " " : "") - + (hasFontClass ? "fontclass " + fontClass + " " : "") + (hasMaxLength ? "maxlength " + maxLength + " " : "") - + "align " + alignValues[align] + " " - + (hasLayout ? "leftmargin " + leftMargin + " rightmargin " + rightMargin + " indent " + indent + " leading " + leading + " " : "") - + (!variableName.equals("") ? "variablename " + variableName + " " : ""); - ret = ret.trim() + "]"; + ret += "\r\nxmin " + bounds.Xmin + "\r\nymin " + bounds.Ymin + "\r\nxmax " + bounds.Xmax + "\r\nymax " + bounds.Ymax + "\r\n"; + ret += (wordWrap ? "wordwrap 1\r\n" : "") + (multiline ? "multiline 1\r\n" : "") + + (password ? "password 1\r\n" : "") + (readOnly ? "readonly 1\r\n" : "") + + (autoSize ? "autosize 1\r\n" : "") + (noSelect ? "noselect 1\r\n" : "") + + (border ? "border 1\r\n" : "") + (wasStatic ? "wasstatic 1\r\n" : "") + + (html ? "html 1\r\n" : "") + (useOutlines ? "useoutlines 1\r\n" : "") + + (hasFont ? "font " + fontId + "\r\n" : "") + (hasTextColor ? "color " + textColor.toHexARGB() + "\r\n" : "") + + (hasFontClass ? "fontclass " + fontClass + "\r\n" : "") + (hasMaxLength ? "maxlength " + maxLength + "\r\n" : "") + + "align " + alignValues[align] + "\r\n" + + (hasLayout ? "leftmargin " + leftMargin + "\r\nrightmargin " + rightMargin + "\r\nindent " + indent + "\r\nleading " + leading + "\r\n" : "") + + (!variableName.equals("") ? "variablename " + variableName + "\r\n" : ""); + ret = ret + "]"; if (hasText) { ret += initialText.replace("\\", "\\\\").replace("[", "\\[").replace("]", "\\]"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java index 729fa2329..d1cc4bfdb 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineText2Tag.java @@ -96,22 +96,22 @@ public class DefineText2Tag extends CharacterTag implements BoundedTag, TextTag public String getFormattedText(List tags) { FontTag fnt = null; String ret = ""; - ret += "[xmin " + textBounds.Xmin + " ymin " + textBounds.Ymin + " xmax " + textBounds.Xmax + " ymax " + textBounds.Ymax; + ret += "[\r\nxmin " + textBounds.Xmin + "\r\nymin " + textBounds.Ymin + "\r\nxmax " + textBounds.Xmax + "\r\nymax " + textBounds.Ymax; if (textMatrix.translateX != 0) { - ret += " translatex " + textMatrix.translateX; + ret += "\r\ntranslatex " + textMatrix.translateX; } if (textMatrix.translateY != 0) { - ret += " translatey " + textMatrix.translateY; + ret += "\r\ntranslatey " + textMatrix.translateY; } if (textMatrix.hasScale) { - ret += " scalex " + textMatrix.scaleX; - ret += " scaley " + textMatrix.scaleY; + ret += "\r\nscalex " + textMatrix.scaleX; + ret += "\r\nscaley " + textMatrix.scaleY; } if (textMatrix.hasRotate) { - ret += " rotateskew0 " + textMatrix.rotateSkew0; - ret += " rotateskew1 " + textMatrix.rotateSkew1; + ret += "\r\nrotateskew0 " + textMatrix.rotateSkew0; + ret += "\r\nrotateskew1 " + textMatrix.rotateSkew1; } - ret += "]"; + ret += "\r\n]"; for (TEXTRECORD rec : textRecords) { String params = ""; if (rec.styleFlagsHasFont) { @@ -123,19 +123,19 @@ public class DefineText2Tag extends CharacterTag implements BoundedTag, TextTag } } } - params += " font " + rec.fontId + " height " + rec.textHeight; + params += "\r\nfont " + rec.fontId + "\r\nheight " + rec.textHeight; } if (rec.styleFlagsHasColor) { - params += " color " + rec.textColorA.toHexARGB(); + params += "\r\ncolor " + rec.textColorA.toHexARGB(); } if (rec.styleFlagsHasXOffset) { - params += " x " + rec.xOffset; + params += "\r\nx " + rec.xOffset; } if (rec.styleFlagsHasYOffset) { - params += " y " + rec.yOffset; + params += "\r\ny " + rec.yOffset; } if (params.length() > 0) { - ret += "[" + params.trim() + "]"; + ret += "[" + params + "\r\n]"; } ret += Helper.escapeString(rec.getText(tags, fnt)).replace("[", "\\[").replace("]", "\\]"); } diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java index c98b00806..40f601e16 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineTextTag.java @@ -96,22 +96,22 @@ public class DefineTextTag extends CharacterTag implements BoundedTag, TextTag { public String getFormattedText(List tags) { FontTag fnt = null; String ret = ""; - ret += "[xmin " + textBounds.Xmin + " ymin " + textBounds.Ymin + " xmax " + textBounds.Xmax + " ymax " + textBounds.Ymax; + ret += "[\r\nxmin " + textBounds.Xmin + "\r\nymin " + textBounds.Ymin + "\r\nxmax " + textBounds.Xmax + "\r\nymax " + textBounds.Ymax; if (textMatrix.translateX != 0) { - ret += " translatex " + textMatrix.translateX; + ret += "\r\ntranslatex " + textMatrix.translateX; } if (textMatrix.translateY != 0) { - ret += " translatey " + textMatrix.translateY; + ret += "\r\ntranslatey " + textMatrix.translateY; } if (textMatrix.hasScale) { - ret += " scalex " + textMatrix.scaleX; - ret += " scaley " + textMatrix.scaleY; + ret += "\r\nscalex " + textMatrix.scaleX; + ret += "\r\nscaley " + textMatrix.scaleY; } if (textMatrix.hasRotate) { - ret += " rotateskew0 " + textMatrix.rotateSkew0; - ret += " rotateskew1 " + textMatrix.rotateSkew1; + ret += "\r\nrotateskew0 " + textMatrix.rotateSkew0; + ret += "\r\nrotateskew1 " + textMatrix.rotateSkew1; } - ret += "]"; + ret += "\r\n]"; for (TEXTRECORD rec : textRecords) { String params = ""; if (rec.styleFlagsHasFont) { @@ -123,19 +123,19 @@ public class DefineTextTag extends CharacterTag implements BoundedTag, TextTag { } } } - params += " font " + rec.fontId + " height " + rec.textHeight; + params += "\r\nfont " + rec.fontId + "\r\nheight " + rec.textHeight; } if (rec.styleFlagsHasColor) { - params += " color " + rec.textColor.toHexRGB(); + params += "\r\ncolor " + rec.textColor.toHexRGB(); } if (rec.styleFlagsHasXOffset) { - params += " x " + rec.xOffset; + params += "\r\nx " + rec.xOffset; } if (rec.styleFlagsHasYOffset) { - params += " y " + rec.yOffset; + params += "\r\ny " + rec.yOffset; } if (params.length() > 0) { - ret += "[" + params.trim() + "]"; + ret += "[" + params + "\r\n]"; } ret += Helper.escapeString(rec.getText(tags, fnt)).replace("[", "\\[").replace("]", "\\]"); } 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 7bb6671b3..fe1b3158e 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java +++ b/trunk/src/com/jpexs/decompiler/flash/tags/text/TextLexer.java @@ -18,243 +18,244 @@ */ package com.jpexs.decompiler.flash.tags.text; + + /** - * This class is a scanner generated by - * JFlex 1.4.3 on 30.4.13 19:25 from the - * specification file + * This class is a scanner generated by + * JFlex 1.4.3 + * on 30.4.13 19:25 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; - /** - * initial size of the lookahead buffer - */ - private static final int ZZ_BUFFERSIZE = 16384; - /** - * lexical states - */ - public static final int YYINITIAL = 0; - public static final int VALUE = 4; - public static final int PARAMETER = 2; - /** - * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l - * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l at the - * beginning of a line l is of the form l = 2*k, k a non negative integer - */ - private static final int ZZ_LEXSTATE[] = { - 0, 0, 1, 1, 2, 2 - }; - /** - * Translates characters to character classes - */ - private static final String ZZ_CMAP_PACKED = - "\12\0\1\15\25\0\1\2\1\0\1\13\4\0\1\14\10\0\12\1" - + "\41\0\1\3\1\4\1\5\1\0\1\1\1\0\1\1\1\6\3\1" - + "\1\11\7\1\1\10\3\1\1\12\1\1\1\7\6\1\uff85\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 = - "\3\0\1\1\1\2\1\1\1\3\1\4\1\5\1\6" - + "\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16" - + "\1\17\1\20\1\21"; + /** This character denotes the end of file */ + public static final int YYEOF = -1; - private static int[] zzUnpackAction() { - int[] result = new int[21]; - int offset = 0; - offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); - return result; + /** initial size of the lookahead buffer */ + private static final int ZZ_BUFFERSIZE = 16384; + + /** lexical states */ + public static final int YYINITIAL = 0; + public static final int VALUE = 4; + public static final int PARAMETER = 2; + + /** + * ZZ_LEXSTATE[l] is the state in the DFA for the lexical state l + * ZZ_LEXSTATE[l+1] is the state in the DFA for the lexical state l + * at the beginning of a line + * l is of the form l = 2*k, k a non negative integer + */ + private static final int ZZ_LEXSTATE[] = { + 0, 0, 1, 1, 2, 2 + }; + + /** + * Translates characters to character classes + */ + private static final String ZZ_CMAP_PACKED = + "\12\0\1\15\2\0\1\3\22\0\1\3\1\0\1\13\4\0\1\14"+ + "\10\0\12\1\41\0\1\4\1\5\1\2\1\0\1\1\1\0\1\1"+ + "\1\6\3\1\1\11\7\1\1\10\3\1\1\12\1\1\1\7\6\1"+ + "\uff85\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 = + "\3\0\1\1\1\2\1\1\1\3\1\4\1\5\1\3"+ + "\1\6\1\7\1\10\1\11\1\12\1\13\1\14\1\15"+ + "\1\16\1\17\1\20\1\21"; + + private static int [] zzUnpackAction() { + int [] result = new int[22]; + int offset = 0; + offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result); + return result; + } + + private static int zzUnpackAction(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int count = packed.charAt(i++); + int value = packed.charAt(i++); + do result[j++] = value; while (--count > 0); } + return j; + } - private static int zzUnpackAction(String packed, int offset, int[] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int count = packed.charAt(i++); - int value = packed.charAt(i++); - do { - result[j++] = value; - } while (--count > 0); - } - return j; + + /** + * Translates a state to a row index in the transition table + */ + private static final int [] ZZ_ROWMAP = zzUnpackRowMap(); + + private static final String ZZ_ROWMAP_PACKED_0 = + "\0\0\0\16\0\34\0\52\0\52\0\70\0\52\0\106"+ + "\0\52\0\124\0\142\0\52\0\52\0\52\0\52\0\52"+ + "\0\52\0\52\0\52\0\52\0\52\0\52"; + + private static int [] zzUnpackRowMap() { + int [] result = new int[22]; + 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++); } - /** - * 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\16\0\34\0\52\0\52\0\70\0\52\0\106" - + "\0\52\0\124\0\52\0\52\0\52\0\52\0\52\0\52" - + "\0\52\0\52\0\52\0\52\0\52"; + return j; + } - private static int[] zzUnpackRowMap() { - int[] result = new int[21]; - int offset = 0; - offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result); - return result; + /** + * The transition table of the DFA + */ + private static final int [] ZZ_TRANS = zzUnpackTrans(); + + private static final String ZZ_TRANS_PACKED_0 = + "\4\4\1\5\1\6\7\4\2\7\1\10\1\11\1\12"+ + "\2\7\5\10\2\7\1\12\2\13\1\11\1\12\11\13"+ + "\1\12\16\0\2\14\1\15\1\14\1\16\1\17\1\20"+ + "\1\21\1\22\1\23\1\24\1\25\1\26\2\0\1\10"+ + "\4\0\5\10\6\0\1\12\11\0\1\12\2\13\2\0"+ + "\11\13\1\0"; + + private static int [] zzUnpackTrans() { + int [] result = new int[112]; + int offset = 0; + offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); + return result; + } + + private static int zzUnpackTrans(String packed, int offset, int [] result) { + int i = 0; /* index in packed string */ + int j = offset; /* index in unpacked array */ + int l = packed.length(); + while (i < l) { + int count = packed.charAt(i++); + int value = packed.charAt(i++); + value--; + do result[j++] = value; while (--count > 0); } + return j; + } - private static int zzUnpackRowMap(String packed, int offset, int[] result) { - int i = 0; /* index in packed string */ - int j = offset; /* index in unpacked array */ - int l = packed.length(); - while (i < l) { - int high = packed.charAt(i++) << 16; - result[j++] = high | packed.charAt(i++); - } - return j; + + /* error codes */ + private static final int ZZ_UNKNOWN_ERROR = 0; + private static final int ZZ_NO_MATCH = 1; + private static final int ZZ_PUSHBACK_2BIG = 2; + + /* error messages for the codes above */ + private static final String ZZ_ERROR_MSG[] = { + "Unkown internal scanner error", + "Error: could not match input", + "Error: pushback value was too large" + }; + + /** + * ZZ_ATTRIBUTE[aState] contains the attributes of state aState + */ + private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute(); + + private static final String ZZ_ATTRIBUTE_PACKED_0 = + "\3\0\2\11\1\1\1\11\1\1\1\11\2\1\13\11"; + + private static int [] zzUnpackAttribute() { + int [] result = new int[22]; + 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); } - /** - * The transition table of the DFA - */ - private static final int[] ZZ_TRANS = zzUnpackTrans(); - private static final String ZZ_TRANS_PACKED_0 = - "\3\4\1\5\1\6\10\4\2\7\1\10\3\7\1\11" - + "\5\10\3\7\2\12\1\7\2\12\1\11\10\12\16\0" - + "\3\13\1\14\1\15\1\16\1\17\1\20\1\21\1\22" - + "\1\23\1\24\1\25\2\0\1\10\4\0\5\10\3\0" - + "\2\12\1\0\2\12\1\0\10\12"; + return j; + } - private static int[] zzUnpackTrans() { - int[] result = new int[98]; - int offset = 0; - offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result); - return result; - } + /** the input device */ + private java.io.Reader zzReader; - 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 state of the DFA */ + private int zzState; - /* error messages for the codes above */ - private static final String ZZ_ERROR_MSG[] = { - "Unkown internal scanner error", - "Error: could not match input", - "Error: pushback value was too large" - }; - /** - * ZZ_ATTRIBUTE[aState] contains the attributes of state - * aState - */ - private static final int[] ZZ_ATTRIBUTE = zzUnpackAttribute(); - private static final String ZZ_ATTRIBUTE_PACKED_0 = - "\3\0\2\11\1\1\1\11\1\1\1\11\1\1\13\11"; + /** the current lexical state */ + private int zzLexicalState = YYINITIAL; - private static int[] zzUnpackAttribute() { - int[] result = new int[21]; - int offset = 0; - offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result); - return result; - } + /** 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(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; + /** 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; + String parameterName=null; - /* user code: */ - StringBuffer string = null; - boolean finish = false; - String parameterName = null; /** * Create an empty lexer, yyrset will be called later to reset and assign * the reader */ public TextLexer() { + } public int yychar() { @@ -262,501 +263,456 @@ 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 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 < 62) { + int count = packed.charAt(i++); + char value = packed.charAt(i++); + do map[j++] = value; while (--count > 0); + } + return map; + } + + + /** + * Refills the input buffer. + * + * @return false, iff there was new input. + * + * @exception java.io.IOException if any I/O-Error occurs + */ + private boolean zzRefill() throws java.io.IOException { + + /* first: make room (if you can) */ + if (zzStartRead > 0) { + System.arraycopy(zzBuffer, zzStartRead, + zzBuffer, 0, + zzEndRead-zzStartRead); + + /* translate stored positions */ + zzEndRead-= zzStartRead; + zzCurrentPos-= zzStartRead; + zzMarkedPos-= zzStartRead; + zzStartRead = 0; } - /** - * Creates a new scanner. There is also java.io.Reader version of this - * constructor. - * - * @param in the java.io.Inputstream to read input from. - */ - public TextLexer(java.io.InputStream in) { - this(new java.io.InputStreamReader(in)); + /* is the buffer big enough? */ + if (zzCurrentPos >= zzBuffer.length) { + /* if not: blow it up */ + char newBuffer[] = new char[zzCurrentPos*2]; + System.arraycopy(zzBuffer, 0, newBuffer, 0, zzBuffer.length); + zzBuffer = newBuffer; } - /** - * Unpacks the compressed character translation table. - * - * @param packed the packed character translation table - * @return the unpacked character translation table - */ - private static char[] zzUnpackCMap(String packed) { - char[] map = new char[0x10000]; - int i = 0; /* index in packed string */ - int j = 0; /* index in unpacked array */ - while (i < 58) { - int count = packed.charAt(i++); - char value = packed.charAt(i++); - do { - map[j++] = value; - } while (--count > 0); - } - return map; + /* finally: fill the buffer with new input */ + int numRead = zzReader.read(zzBuffer, zzEndRead, + zzBuffer.length-zzEndRead); + + if (numRead > 0) { + zzEndRead+= numRead; + return false; } - - /** - * Refills the input buffer. - * - * @return false, iff there was new input. - * - * @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 + // 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; + } } - /** - * Closes the input stream. - */ - public final void yyclose() throws java.io.IOException { - zzAtEOF = true; /* indicate end of file */ - zzEndRead = zzStartRead; /* invalidate buffer */ + // numRead < 0 + return true; + } - if (zzReader != null) { - zzReader.close(); + + /** + * 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++; } - } + } - /** - * 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 (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; - throw new Error(message); - } + zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL; + + zzState = ZZ_LEXSTATE[zzLexicalState]; - /** - * Pushes the specified amount of characters back into the input stream. - * - * They will be read again by then next call of the scanning method - * - * @param number the number of characters to be read again. This number must - * not be greater than yylength()! - */ - public void yypushback(int number) { - if (number > yylength()) { - zzScanError(ZZ_PUSHBACK_2BIG); - } - - zzMarkedPos -= number; - } - - /** - * 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) { - 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 (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; } - - 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--; - } + else { + zzInput = zzBufferL[zzCurrentPosL++]; } - zzAction = -1; + } + int zzNext = zzTransL[ zzRowMapL[zzState] + zzCMapL[zzInput] ]; + if (zzNext == -1) break zzForAction; + zzState = zzNext; - zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL; + int zzAttributes = zzAttrL[zzState]; + if ( (zzAttributes & 1) == 1 ) { + zzAction = zzState; + zzMarkedPosL = zzCurrentPosL; + if ( (zzAttributes & 8) == 8 ) break zzForAction; + } - 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 7: { - throw new ParseException("Illegal escape sequence \"" + yytext() + "\"", yyline + 1); - } - case 19: - break; - case 13: { - if (string == null) { - string = new StringBuffer(); - } - string.append('\n'); - } - case 20: - break; - case 2: { - yybegin(PARAMETER); - if (string != null) { - String ret = string.toString(); - string = null; - return new ParsedSymbol(SymbolType.TEXT, ret.toString()); - } - } - case 21: - break; - case 11: { - if (string == null) { - string = new StringBuffer(); - } - string.append('\b'); - } - case 22: - break; - case 17: { - if (string == null) { - string = new StringBuffer(); - } - string.append('\''); - } - case 23: - break; - case 4: { - parameterName = yytext(); - yybegin(VALUE); - } - case 24: - break; - case 6: { - yybegin(PARAMETER); - return new ParsedSymbol(SymbolType.PARAMETER, new Object[]{parameterName, yytext()}); - } - case 25: - break; - case 10: { - if (string == null) { - string = new StringBuffer(); - } - string.append(']'); - } - case 26: - break; - case 12: { - if (string == null) { - string = new StringBuffer(); - } - string.append('\t'); - } - case 27: - break; - case 8: { - if (string == null) { - string = new StringBuffer(); - } - string.append('['); - } - case 28: - break; - case 9: { - if (string == null) { - string = new StringBuffer(); - } - string.append('\\'); - } - case 29: - break; - case 16: { - if (string == null) { - string = new StringBuffer(); - } - string.append('\"'); - } - case 30: - break; - case 15: { - if (string == null) { - string = new StringBuffer(); - } - string.append('\r'); - } - case 31: - break; - case 14: { - if (string == null) { - string = new StringBuffer(); - } - string.append('\f'); - } - case 32: - break; - case 5: { - yybegin(YYINITIAL); - } - case 33: - break; - case 3: { - } - 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 22: - 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 7: + { throw new ParseException("Illegal escape sequence \""+yytext()+"\"",yyline+1); + } + case 19: break; + case 13: + { if(string==null) string=new StringBuffer(); string.append( '\n' ); + } + case 20: break; + case 2: + { yybegin(PARAMETER); + if(string!=null){ + String ret=string.toString(); + string = null; + return new ParsedSymbol(SymbolType.TEXT,ret.toString()); + } + } + case 21: break; + case 11: + { if(string==null) string=new StringBuffer(); string.append( '\b' ); + } + case 22: break; + case 17: + { if(string==null) string=new StringBuffer(); string.append( '\'' ); + } + case 23: break; + case 4: + { parameterName = yytext(); + yybegin(VALUE); + } + case 24: break; + case 6: + { yybegin(PARAMETER); + return new ParsedSymbol(SymbolType.PARAMETER,new Object[]{parameterName,yytext()}); + } + case 25: break; + case 8: + { if(string==null) string=new StringBuffer(); string.append( ']' ); + } + case 26: break; + case 12: + { if(string==null) string=new StringBuffer(); string.append( '\t' ); + } + case 27: break; + case 9: + { if(string==null) string=new StringBuffer(); string.append( '[' ); + } + case 28: break; + case 10: + { if(string==null) string=new StringBuffer(); string.append( '\\' ); + } + case 29: break; + case 16: + { if(string==null) string=new StringBuffer(); string.append( '\"' ); + } + case 30: break; + case 15: + { if(string==null) string=new StringBuffer(); string.append( '\r' ); + } + case 31: break; + case 14: + { if(string==null) string=new StringBuffer(); string.append( '\f' ); + } + case 32: break; + case 5: + { yybegin(YYINITIAL); + } + case 33: break; + case 3: + { + } + 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 23: break; + default: + { + return null; + } + } + } + else { + zzScanError(ZZ_NO_MATCH); + } + } } + } + + } diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/text/text.flex b/trunk/src/com/jpexs/decompiler/flash/tags/text/text.flex index 01dc7b211..b5ece9ae6 100644 --- a/trunk/src/com/jpexs/decompiler/flash/tags/text/text.flex +++ b/trunk/src/com/jpexs/decompiler/flash/tags/text/text.flex @@ -55,7 +55,8 @@ package com.jpexs.decompiler.flash.tags.text; %} Parameter = [a-z0-9_]+ -Value = [^ \]]+ +Value = [^ \r\n\]]+ +Divider = [ \r\n]+ %state PARAMETER,VALUE @@ -89,7 +90,7 @@ Value = [^ \]]+ } { - " " {} + {Divider} {} {Parameter} { parameterName = yytext(); yybegin(VALUE); @@ -100,7 +101,7 @@ Value = [^ \]]+ } { - " " {} + {Divider} {} {Value} { yybegin(PARAMETER); return new ParsedSymbol(SymbolType.PARAMETER,new Object[]{parameterName,yytext()});