little bugfixes

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / compiler / ast / StringLiteral.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/StringLiteral.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/StringLiteral.java
index f20decb..7ef16a1 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/StringLiteral.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/StringLiteral.java
@@ -1,90 +1,98 @@
 /*******************************************************************************
  * Copyright (c) 2000, 2001, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v0.5
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/cpl-v05.html
- * 
+ *
  * Contributors:
  *     IBM Corporation - initial API and implementation
  ******************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.ast;
 
-//import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
-//import net.sourceforge.phpdt.internal.compiler.codegen.CodeStream;
-//import net.sourceforge.phpdt.internal.compiler.impl.Constant;
-//import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
-//import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding;
+import test.Token;
 
-public class StringLiteral {
-       char[] source;
-       public int sourceStart, sourceEnd;
-       
-       public StringLiteral(char[] token, int s, int e) {
-               source = token;
-               sourceStart = s;
-               sourceEnd = e;
-       }
-       public StringLiteral(int s, int e) {
-               sourceStart = s;
-               sourceEnd = e;
-       }
+import java.util.List;
 
-       /**
-        * source method comment.
-        */
-       public char[] source() {
-               return source;
-       }
-       public String toStringExpression() {
+public class StringLiteral extends Literal {
+  String source;
 
-               // handle some special char.....
-               StringBuffer result = new StringBuffer("\""); //$NON-NLS-1$
-               for (int i = 0; i < source.length; i++) {
-                       switch (source[i]) {
-                               case '\b' :
-                                       result.append("\\b"); //$NON-NLS-1$
-                                       break;
-                               case '\t' :
-                                       result.append("\\t"); //$NON-NLS-1$
-                                       break;
-                               case '\n' :
-                                       result.append("\\n"); //$NON-NLS-1$
-                                       break;
-                               case '\f' :
-                                       result.append("\\f"); //$NON-NLS-1$
-                                       break;
-                               case '\r' :
-                                       result.append("\\r"); //$NON-NLS-1$
-                                       break;
-                               case '\"' :
-                                       result.append("\\\""); //$NON-NLS-1$
-                                       break;
-                               case '\'' :
-                                       result.append("\\'"); //$NON-NLS-1$
-                                       break;
-                               case '\\' : //take care not to display the escape as a potential real char
-                                       result.append("\\\\"); //$NON-NLS-1$
-                                       break;
-                               default :
-                                       result.append(source[i]);
-                       }
-               }
-               result.append("\""); //$NON-NLS-1$
-               return result.toString();
-       }
-       
-       /** 
-        * @deprecated - use field instead
-       */
-       public int sourceEnd() {
-               return sourceEnd;
-       }
-       
-       /** 
-        * @deprecated - use field instead
-       */
-       public int sourceStart() {
-               return sourceStart;
-       }
+  AbstractVariable[] variablesInside;
+
+  public StringLiteral(final Token token) {
+    super(token.sourceStart,token.sourceEnd);
+    source = token.image;
+  }
+
+  /**
+   * Create a new StringLiteral
+   * @param token the token
+   * @param s sourcestart
+   * @param e sourceend
+   * @deprecated
+   */
+  public StringLiteral(final String token, final int s, final int e) {
+    super(s, e);
+    source = token;
+  }
+
+  /**
+   * Create a new StringLiteral
+   * @param token the token
+   * @param s sourcestart
+   * @param e sourceend
+   * @deprecated
+   */
+  public StringLiteral(final String token,
+                       final int s,
+                       final int e,
+                       final AbstractVariable[] variablesInside) {
+    super(s, e);
+    source = token;
+    this.variablesInside = variablesInside;
+  }
+
+  /**
+   * Create a new StringLiteral
+   * @param token the token
+   * @param s sourcestart
+   * @param e sourceend
+   * @deprecated
+   */
+  public StringLiteral(final char[] token, final int s, final int e) {
+    this(new String(token),s, e);
+  }
+
+  public StringLiteral(final int s, final int e) {
+    super(s, e);
+  }
+  /**
+   * Return the expression as String.
+   * @return the expression
+   */
+  public String toStringExpression() {
+    return source;
+  }
+
+  /**
+   * @deprecated - use field instead
+   */
+  public int sourceEnd() {
+    return sourceEnd;
+  }
+
+  /**
+   * @deprecated - use field instead
+   */
+  public int sourceStart() {
+    return sourceStart;
+  }
+
+  public void getUsedVariable(final List list) {
+    if (variablesInside != null) {
+      for (int i = 0; i < variablesInside.length; i++) {
+        variablesInside[i].getUsedVariable(list);
+      }
+    }
+  }
 }