break :: into :, : anywhere in a slice

google · Mar 1, 2016 · 54bb3a3 · 54bb3a3
1 parent 34e85ae
commit 54bb3a3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/core/parser.cpp b/core/parser.cpp
@@ -854,13 +854,23 @@ namespace {
                         if (peek().kind == Token::BRACKET_R)
                             throw unexpected(pop(), "parsing index");
 
+                        // break up "::" into ":", ":" before we start parsing.
                         if (peek().kind == Token::OPERATOR && peek().data == "::") {
                             Token joined = pop();
                             push(Token(Token::OPERATOR, joined.fodder, ":", "", "",
                                        joined.location));
                             push(Token(Token::OPERATOR, Fodder{}, ":", "", "", joined.location));
                         }
 
+                        Token first_token = pop();
+                        if (peek().kind == Token::OPERATOR && peek().data == "::") {
+                            Token joined = pop();
+                            push(Token(Token::OPERATOR, joined.fodder, ":", "", "",
+                                       joined.location));
+                            push(Token(Token::OPERATOR, Fodder{}, ":", "", "", joined.location));
+                        }
+                        push(first_token);
+
                         if (peek().data != ":")
                             first = parse(MAX_PRECEDENCE);
 

diff --git a/test_suite/slice.sugar.jsonnet b/test_suite/slice.sugar.jsonnet
@@ -48,6 +48,14 @@ local arrCases = [
         input: arr[::],
         output: arr,
     },
+    {
+        input: arr[1::],
+        output: [1, 2, 3, 4, 5],
+    },
+    {
+        input: arr[1::2],
+        output: [1, 3, 5],
+    },
     {
         input: arr[::2],
         output: [0, 2, 4],
@@ -100,6 +108,14 @@ local strCases = [
         input: str[::],
         output: str,
     },
+    {
+        input: str[1::],
+        output: "12345",
+    },
+    {
+        input: str[1::2],
+        output: "135",
+    },
     {
         input: str[::2],
         output: "024",