1836 - bugfix in paren-insertion

http://arclanguage.org/item?id=16414
akkartik · Jun 14, 2012 · 70cfb18 · 70cfb18
1 parent 9df452d
commit 70cfb18
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/002parenthesize.cc b/002parenthesize.cc
@@ -57,18 +57,13 @@ list<Token> nextLine(CodeStream& c) {
                                     return (*q == "(");
                                   }
 
-                                  Token nthTokenInLine(list<Token> line, long n) {
-                                    list<Token>::iterator p = line.begin();
-                                    for (long i = 0; i < n; ++i)
-                                      ++p;
-                                    return *p;
-                                  }
-
                                   bool alreadyGrouped(list<Token> line) {
-                                    Token firstToken = nthTokenInLine(line, 1);
-                                    Token secondToken = nthTokenInLine(line, 2); // line must have 2 tokens
-                                    return firstToken == "("
-                                        || (isQuoteOrUnquote(firstToken) && secondToken == "(");
+                                    for (list<Token>::iterator p = line.begin(); p != line.end(); ++p) {
+                                      if (p->isIndent()) continue;
+                                      if (isQuoteOrUnquote(*p)) continue;
+                                      return *p == "(";
+                                    }
+                                    return true;
                                   }
 
                                   bool continuationLine(long currLineIndent, stack<long> parenStack) {

diff --git a/002parenthesize.test.cc b/002parenthesize.test.cc
@@ -211,6 +211,21 @@ void test_parenthesize_passes_through_quoted_groups2() {
   check(c.fd.eof());
 }
 
+void test_parenthesize_passes_through_quoted_groups3() {
+  CodeStream c(stream(",,(a b c)"));
+  list<Token> tokens = nextExpr(c);
+  list<Token>::iterator p = tokens.begin();
+  checkEq(*p, ","); ++p;
+  checkEq(*p, ","); ++p;
+  checkEq(*p, "("); ++p;
+  checkEq(*p, "a"); ++p;
+  checkEq(*p, "b"); ++p;
+  checkEq(*p, "c"); ++p;
+  checkEq(*p, ")"); ++p;
+  check(p == tokens.end());
+  check(c.fd.eof());
+}
+
 void test_parenthesize_groups_words_on_single_indented_line() {
   CodeStream c(stream("    a b c\n  34"));
   list<Token> tokens = nextExpr(c);