Cleaned up a couple of errors in the SExpression whitespace handling.

samotage · May 7, 2009 · 7844a21 · 7844a21
1 parent 62af159
commit 7844a21
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/AikoSExpression.cpp b/AikoSExpression.cpp
@@ -5,7 +5,7 @@ namespace Aiko {
 
   char* SExpression::scan(char* head, char* tail, SExpression* expression) {
     char* s = skipWhitespace(head, tail);
-    switch(*head) {
+    switch(*s) {
       case '(':
         s = scanArray(s, tail, expression);
         break;
@@ -61,12 +61,7 @@ namespace Aiko {
 
   char* SExpressionArray::parse(char* head, char* tail, SExpressionArray* array) {
     char* s = skipWhitespace(head, tail);
-
-    if (array) {
-      array->head_ = s;
-      array->tail_ = tail;
-    }
-
+    if (array) array->head_ = s;
     if (s < tail && *s == '(') {
       s++;
 
@@ -78,6 +73,7 @@ namespace Aiko {
       }
 
       if (s < tail && *s == ')') {
+        if (array) array->tail_ = s;
         s = skipWhitespace(++s, tail);
         return s;
       }