Rewritten Parser/Scanner to package net.sourceforge.phpdt.internal.compiler.parser

[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 85bf3c3..f20decb 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
@@ -10,96 +10,81 @@
  ******************************************************************************/
 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 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;
 
-public class StringLiteral extends Literal {
+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;
+       }
 
-public StringLiteral(char[] token, int s, int e) {
-       this(s,e);
-       source = token;
-}
-public StringLiteral(int s, int e) {
-       super(s,e);
-}
-public void computeConstant() {
-
-       constant = Constant.fromValue(String.valueOf(source));}
-public ExtendedStringLiteral extendWith(CharLiteral lit){
-       //add the lit source to mine, just as if it was mine
-
-       return new ExtendedStringLiteral(this,lit);
-}
-public ExtendedStringLiteral extendWith(StringLiteral lit){
-       //add the lit source to mine, just as if it was mine
-
-       return new ExtendedStringLiteral(this,lit);
-}
-/**
- * Code generation for string literal
- *
- * @param currentScope org.eclipse.jdt.internal.compiler.lookup.BlockScope
- * @param codeStream org.eclipse.jdt.internal.compiler.codegen.CodeStream
- * @param valueRequired boolean
- */ 
-public void generateCode(BlockScope currentScope, CodeStream codeStream, boolean valueRequired) {
-       int pc = codeStream.position;
-       if (valueRequired)
-               codeStream.ldc(constant.stringValue());
-       codeStream.recordPositionsFrom(pc, this.sourceStart);
-}
-public TypeBinding literalType(BlockScope scope) {
-       return scope.getJavaLangString();
-}
-/**
- * source method comment.
- */
-public char[] source() {
-       return source;
-}
-public String toStringExpression() {
+       /**
+        * source method comment.
+        */
+       public char[] source() {
+               return source;
+       }
+       public String toStringExpression() {
 
-       // 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]);
+               // 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;
        }
-       result.append("\""); //$NON-NLS-1$
-       return result.toString();
-}
-public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) {
-       visitor.visit(this, scope);
-       visitor.endVisit(this, scope);
-}
 }