Fix #172

Author: sparkprime

core/ast.h

@@ -432,21 +432,21 @@ struct Function : public AST {
     }
 };
 
-struct LiteralString;
-
 /** Represents import "file". */
 struct Import : public AST {
-    LiteralString *file;
-    Import(const LocationRange &lr, const Fodder &open_fodder, LiteralString *file)
+    // Must be a LiteralString.
+    AST *file;
+    Import(const LocationRange &lr, const Fodder &open_fodder, AST *file)
         : AST(lr, AST_IMPORT, open_fodder), file(file)
     {
     }
 };
 
 /** Represents importstr "file". */
 struct Importstr : public AST {
-    LiteralString *file;
-    Importstr(const LocationRange &lr, const Fodder &open_fodder, LiteralString *file)
+    // Must be a LiteralString.
+    AST *file;
+    Importstr(const LocationRange &lr, const Fodder &open_fodder, AST *file)
         : AST(lr, AST_IMPORTSTR, open_fodder), file(file)
     {
     }

core/desugarer.cpp

@@ -643,11 +643,11 @@ class Desugarer {
             desugar(ast->body, obj_level);
             desugarParams(ast->params, obj_level);
 
-        } else if (dynamic_cast<const Import *>(ast_)) {
-            // Nothing to do.
+        } else if (auto *ast = dynamic_cast<Import *>(ast_)) {
+            desugar(ast->file, obj_level);
 
-        } else if (dynamic_cast<const Importstr *>(ast_)) {
-            // Nothing to do.
+        } else if (auto *ast = dynamic_cast<Importstr *>(ast_)) {
+            desugar(ast->file, obj_level);
 
         } else if (auto *ast = dynamic_cast<InSuper *>(ast_)) {
             desugar(ast->element, obj_level);

core/formatter.cpp

@@ -2031,7 +2031,7 @@ class SortImports {
     /// Get the value by which the imports should be sorted.
     UString sortingKey(Import *import)
     {
-        return import->file->value;
+        return dynamic_cast<const LiteralString*>(import->file)->value;
     }
 
     /// Check if `local` expression is used for importing,

core/string_utils.h

@@ -22,6 +22,11 @@ limitations under the License.
 /** Unparse the string. */
 UString jsonnet_string_unparse(const UString &str, bool single);
 
+
+// Note that the following two functions do not handle the quoting of ' and "
+// inside verbatim strings because that quoting is reversible.  Thus, that
+// quoting is done at lexing time and undone again at pretty-printing time.
+
 /** Escape special characters. */
 UString jsonnet_string_escape(const UString &str, bool single);
 

core/vm.cpp

@@ -1509,7 +1509,8 @@ class Interpreter {
 
             case AST_IMPORT: {
                 const auto &ast = *static_cast<const Import *>(ast_);
-                HeapThunk *thunk = import(ast.location, ast.file);
+                const auto *file = static_cast<const LiteralString *>(ast.file);
+                HeapThunk *thunk = import(ast.location, file);
                 if (thunk->filled) {
                     scratch = thunk->content;
                 } else {
@@ -1521,7 +1522,8 @@ class Interpreter {
 
             case AST_IMPORTSTR: {
                 const auto &ast = *static_cast<const Importstr *>(ast_);
-                const ImportCacheValue *value = importString(ast.location, ast.file);
+                const auto *file = static_cast<const LiteralString *>(ast.file);
+                const ImportCacheValue *value = importString(ast.location, file);
                 scratch = makeString(decode_utf8(value->content));
             } break;
 

doc/language/spec.html

@@ -138,7 +138,8 @@ <h2 id="lexing">Lexing</h2>
 first subsequent line that does not begin with <i>W</i>, and it is an error if this line does not
 contain some optional whitespace followed by <code>|||</code>.  The content of the string is the
 concatenation of all the lines that began with <i>W</i> but with that prefix stripped.  The line
-ending style in the file is preserved in the string.</li>
+ending style in the file is preserved in the string.  This form cannot be used in
+<code>import</code> statements.</li>
 </ul>
 
 <p>Double- and single-quoted strings are allowed to span multiple lines, in which case whatever

test_suite/import.jsonnet

@@ -17,14 +17,20 @@ limitations under the License.
 // Can capture variables from another file.
 std.assertEqual((import "lib/A_20_func.libsonnet")(), 20) &&
 
+// Ensure string is quoted.
+std.assertEqual((import "lib/\u0041_20_func.libsonnet")(), 20) &&
+
 # Test single quoted string.
 std.assertEqual((import 'lib/A_20_func.libsonnet')(), 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.libsonnet"; lib, 20) &&
 std.assertEqual(local A = 7, lib = import "lib/A_20.libsonnet"; lib, 20) &&
+
 std.assertEqual(importstr "lib/some_file.txt", "Hello World!\n") &&
+std.assertEqual(importstr "lib/\u0073ome_file.txt", "Hello World!\n") &&
+
 std.assertEqual(import "lib/rel_path.libsonnet", "rel_path") &&
 std.assertEqual(import "lib/rel_path4.libsonnet", "rel_path") &&