navigine/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-10-30 10:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore import into caller's namespace

Browse Source
This commit is contained in:
Nicolas Williams committed 2015-06-26 23:40:37 -05:00
1 parent 8cc31f0f49
commit aaf305868c
6 files changed
+959 -880
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

parser.y
+17
View File
@@ -487,6 +487,12 @@ Import:
jv_free($4);
jv_free(v);
} |
"import" String ';' {
jv v = block_const($2);
$$ = gen_import(jv_string_value(v), gen_noop(), NULL, 0);
block_free($2);
jv_free(v);
} |
"import" String "as" IDENT Exp ';' {
if (!block_is_const($5)) {
FAIL(@$, "Module metadata must be constant.");
@@ -499,6 +505,17 @@ Import:
block_free($2);
jv_free($4);
} |
"import" String Exp ';' {
if (!block_is_const($3)) {
FAIL(@$, "Module metadata must be constant.");
$$ = gen_noop();
} else {
jv v = block_const($2);
$$ = gen_import(jv_string_value(v), $3, NULL, 0);
jv_free(v);
}
block_free($2);
} |
"import" String "as" '$' IDENT Exp ';' {
if (!block_is_const($6)) {
FAIL(@$, "Module metadata must be constant.");