Changeset 161

Timestamp:

10/18/02 21:35:47 (21 years ago)

Author:

piso

Message:

Handle multi-line quoted strings correctly.

File:

• trunk/j/src/org/armedbear/j/LispSyntaxIterator.java (modified) (4 diffs)

trunk/j/src/org/armedbear/j/LispSyntaxIterator.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: LispSyntaxIterator.java,v 1.1.1.1 2002-09-24 16:09:30 piso Exp $
+ * $Id: LispSyntaxIterator.java,v 1.2 2002-10-18 21:35:47 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -25 +25 @@
 // i.e. skipping whitespace and comments.
 public final class LispSyntaxIterator extends DefaultSyntaxIterator
+    implements Constants
 {
     public LispSyntaxIterator(Position pos)
@@ -31 +32 @@
     }
 
+    // Caller must make sure parseBuffer() has been called so flags will be
+    // correct.
+    public char[] hideSyntacticWhitespace(Line line)
+    {
+        if (line.flags() == STATE_QUOTE)
+            return hideSyntacticWhitespace(line.getText(), STATE_QUOTE);
+        else
+            return hideSyntacticWhitespace(line.getText(), STATE_NEUTRAL);
+    }
+
+    public char[] hideSyntacticWhitespace(String s)
+    {
+        return hideSyntacticWhitespace(s, STATE_NEUTRAL);
+    }
+
     // Returns char array with syntactic whitespace (quotes and comments)
     // replaced with actual space characters.
-    public char[] hideSyntacticWhitespace(String s)
+    public char[] hideSyntacticWhitespace(String s, int initialState)
     {
         char[] chars = s.toCharArray();
-        boolean inQuote = false;
+        int state = initialState;
         int length = chars.length;
         for (int i = 0; i < length; i++) {
             char c = chars[i];
-            if (inQuote) {
+            if (c == '\\' && i < length-1) {
+                // Escape character.
+                chars[i++] = ' ';
                 chars[i] = ' ';
-                if (c == '\\' && i < length-1) {
-                    // Handle escape char.
-                    chars[++i] = ' ';
-                } else if (c == '"')
-                    inQuote = false;
+                continue;
+            }
+            if (state == STATE_QUOTE) {
+                chars[i] = ' ';
+                if (c == '"')
+                    state = STATE_NEUTRAL;
             } else if (c == '"') {
-                inQuote = true;
+                state = STATE_QUOTE;
                 chars[i] = ' ';
             }
@@ -55 +74 @@
         int index = -1;
         for (int i = 0; i < length-1; i++) {
-            if (chars[i] == ';') {
+            if (chars[i] == '\\')
+                ++i; // Escape character.
+            else if (chars[i] == ';') {
                 index = i;
                 break;