Finish implementation of single quote string literals, fix #72

Author: sparkprime

core/desugaring.cpp

@@ -72,6 +72,7 @@ static String desugar_string(const LocationRange &loc, const String &s)
             case '\\':
             switch (*(++c)) {
                 case '"':
+                case '\'':
                 r += *c;
                 break;
 

core/parser.cpp

@@ -709,7 +709,8 @@ namespace {
                 first = false;
 
                 switch (next.kind) {
-                    case Token::BRACKET_L: case Token::IDENTIFIER: case Token::STRING_DOUBLE: {
+                    case Token::BRACKET_L: case Token::IDENTIFIER: case Token::STRING_DOUBLE:
+                    case Token::STRING_SINGLE: case Token::STRING_BLOCK: {
                         ObjectField::Kind kind;
                         AST *expr1 = nullptr;
                         const Identifier *id = nullptr;
@@ -720,6 +721,14 @@ namespace {
                             kind = ObjectField::FIELD_STR;
                             expr1 = alloc->make<LiteralString>(
                                 next.location, next.data32(), LiteralString::DOUBLE, "");
+                        } else if (next.kind == Token::STRING_SINGLE) {
+                            kind = ObjectField::FIELD_STR;
+                            expr1 = alloc->make<LiteralString>(
+                                next.location, next.data32(), LiteralString::SINGLE, "");
+                        } else if (next.kind == Token::STRING_BLOCK) {
+                            kind = ObjectField::FIELD_STR;
+                            expr1 = alloc->make<LiteralString>(
+                                next.location, next.data32(), LiteralString::BLOCK, "");
                         } else {
                             kind = ObjectField::FIELD_EXPR;
                             expr1 = parse(MAX_PRECEDENCE);

test_suite/error.parse.string.unfinished2.jsonnet

@@ -0,0 +1,17 @@
+/*
+Copyright 2015 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+'

test_suite/error.parse.string.unfinished2.jsonnet.golden

@@ -0,0 +1 @@
+STATIC ERROR: error.parse.string.unfinished2.jsonnet:17:1: Unterminated string

test_suite/import.jsonnet

@@ -17,6 +17,10 @@ limitations under the License.
 // Can capture variables from another file.
 std.assertEqual((import "lib/A_20_func.jsonnet")(), 20) &&
 
+# Test single quoted string.
+std.assertEqual((import 'lib/A_20_func.jsonnet')(), 20) &&
+# The block string is hard to test because the filename would include a terminating \n
+
 // Each import has its own environment, can't be overidden.
 std.assertEqual(local A = 7; local lib = import "lib/A_20.jsonnet"; lib, 20) &&
 std.assertEqual(local A = 7, lib = import "lib/A_20.jsonnet"; lib, 20) &&

test_suite/unparse.jsonnet

@@ -20,7 +20,10 @@ limitations under the License.
     number: 1/3,
     small_number: 0.00000000000001,
     zero: 0,
-    string: "foo\n bar\n\n\"bar\u0005\"\t \u0050\b\f\r\\",
+    string: "'foo\n bar\n\n\"bar\u0005\"\'\t \u0050\b\f\r\\",
+    string2: '"foo\n bar\n\n\'bar\u0005\"\'\t \u0050\b\f\r\\',
+    "lit_field1": 1,
+    'lit_field2': 1,
     "false": false,
     "true": true,
     "null": null,

test_suite/unparse.jsonnet.golden

@@ -1,11 +1,14 @@
 {
    "false": false,
+   "lit_field1": 1,
+   "lit_field2": 1,
    "neg_integer": -1029301293,
    "null": null,
    "number": 0.33333333333333331,
    "pos_integer": 13212381932,
    "small_number": 1e-14,
-   "string": "foo\n bar\n\n\"bar\u0005\"\t P\b\f\r\\",
+   "string": "'foo\n bar\n\n\"bar\u0005\"'\t P\b\f\r\\",
+   "string2": "\"foo\n bar\n\n'bar\u0005\"'\t P\b\f\r\\",
    "true": true,
    "zero": 0
 }