@port-labs/jq-node-bindings 1.0.4 → 1.1.0-dev

package/deps/jq/src/lexer.h

@@ -2,9 +2,9 @@
 #define jq_yyHEADER_H 1
 #define jq_yyIN_HEADER 1
 
-#line 5 "src/lexer.h"
+#line 6 "src/lexer.h"
 
-#line 7 "src/lexer.h"
+#line 8 "src/lexer.h"
 
 #define  YY_INT_ALIGNED short int
 
@@ -462,6 +462,7 @@ void yyfree ( void * , yyscan_t yyscanner );
 #define IN_BRACE 3
 #define IN_QQINTERP 4
 #define IN_QQSTRING 5
+#define IN_COMMENT 6
 
 #endif
 
@@ -731,9 +732,9 @@ extern int yylex \
 #undef yyTABLES_NAME
 #endif
 
-#line 131 "src/lexer.l"
+#line 137 "src/lexer.l"
 
 
-#line 737 "src/lexer.h"
+#line 739 "src/lexer.h"
 #undef jq_yyIN_HEADER
 #endif /* jq_yyHEADER_H */

package/deps/jq/src/lexer.l

@@ -21,6 +21,7 @@ struct lexer_param;
 %s IN_BRACE
 %s IN_QQINTERP
 %x IN_QQSTRING
+%x IN_COMMENT
 %{
   static int enter(int opening, int state, yyscan_t yyscanner);
   static int try_exit(int closing, int state, yyscan_t yyscanner);
@@ -37,7 +38,12 @@ struct lexer_param;
 
 %%
 
-"#"[^\n]* { /* comments */ }
+"#" { yy_push_state(IN_COMMENT, yyscanner); }
+<IN_COMMENT>{
+  \\(\\|\r?\n)|. { }
+  \r?\n { yy_pop_state(yyscanner); }
+}
+<IN_COMMENT><<EOF>> { yy_pop_state(yyscanner); }
 
 "!=" { return NEQ; }
 "==" { return EQ; }
@@ -124,7 +130,7 @@ struct lexer_param;
 \.[a-zA-Z_][a-zA-Z_0-9]*  { yylval->literal = jv_string(yytext+1); return FIELD;}
 \$([a-zA-Z_][a-zA-Z_0-9]*::)*[a-zA-Z_][a-zA-Z_0-9]*  { yylval->literal = jv_string(yytext+1); return BINDING;}
 
-[ \n\t]+  {}
+[ \r\n\t]+  {}
 
 . { return INVALID_CHARACTER; }
 

package/deps/jq/src/libm.h

@@ -249,11 +249,6 @@ LIBM_DDD(nexttoward)
 #else
 LIBM_DDD_NO(nexttoward)
 #endif
-#if defined(HAVE_POW10) && !defined(WIN32)
-LIBM_DD(pow10)
-#else
-LIBM_DD_NO(pow10)
-#endif
 #ifdef HAVE_RINT
 LIBM_DD(rint)
 #else
@@ -289,3 +284,18 @@ LIBM_DDD(ldexp)
 #else
 LIBM_DDD_NO(ldexp)
 #endif
+#ifdef HAVE_MODF
+LIBM_DA(modf, double)
+#else
+LIBM_DA_NO(modf, double)
+#endif
+#ifdef HAVE_FREXP
+LIBM_DA(frexp, int)
+#else
+LIBM_DA_NO(frexp, int)
+#endif
+#ifdef HAVE_LGAMMA_R
+LIBM_DA(lgamma_r, int)
+#else
+LIBM_DA_NO(lgamma_r, int)
+#endif

package/deps/jq/src/linker.c

@@ -420,14 +420,16 @@ int load_program(jq_state *jq, struct locfile* src, block *out_block) {
     return 1;
   }
 
-  char* home = getenv("HOME");
-  if (home) {    // silently ignore no $HOME
-    /* Import ~/.jq as a library named "" found in $HOME */
+  jv home = get_home();
+  if (jv_is_valid(home)) {
+    /* Import ~/.jq as a library named "" found in $HOME or %USERPROFILE% */
     block import = gen_import_meta(gen_import("", NULL, 0),
         gen_const(JV_OBJECT(
             jv_string("optional"), jv_true(),
-            jv_string("search"), jv_string(home))));
+            jv_string("search"), home)));
     program = BLOCK(import, program);
+  } else {    // silently ignore if home dir not determined
+    jv_free(home);
   }
 
   nerrors = process_dependencies(jq, jq_get_jq_origin(jq), jq_get_prog_origin(jq), &program, &lib_state);

package/deps/jq/src/locfile.c

@@ -7,7 +7,7 @@
 #include "jq.h"
 #include "jv_alloc.h"
 #include "locfile.h"
-
+#include "util.h"
 
 struct locfile* locfile_init(jq_state *jq, const char *fname, const char* data, int length) {
   struct locfile* l = jv_mem_alloc(sizeof(struct locfile));
@@ -63,13 +63,6 @@ static int locfile_line_length(struct locfile* l, int line) {
 void locfile_locate(struct locfile* l, location loc, const char* fmt, ...) {
   va_list fmtargs;
   va_start(fmtargs, fmt);
-  int startline;
-  int offset;
-
-  if (loc.start != -1) {
-    startline = locfile_get_line(l, loc.start);
-    offset = l->linemap[startline];
-  }
 
   jv m1 = jv_string_vfmt(fmt, fmtargs);
   va_end(fmtargs);
@@ -78,15 +71,22 @@ void locfile_locate(struct locfile* l, location loc, const char* fmt, ...) {
     return;
   }
   if (loc.start == -1) {
-    jq_report_error(l->jq, jv_string_fmt("jq: error: %s\n<unknown location>", jv_string_value(m1)));
+    jq_report_error(l->jq, jv_string_fmt("jq: error: %s", jv_string_value(m1)));
     jv_free(m1);
     return;
   }
-  jv m2 = jv_string_fmt("%s at %s, line %d:\n%.*s%*s", jv_string_value(m1),
-                        jv_string_value(l->fname), startline + 1,
+
+  int startline = locfile_get_line(l, loc.start);
+  int offset = l->linemap[startline];
+  int end = MIN(loc.end, MAX(l->linemap[startline+1] - 1, loc.start + 1));
+  jv underline = jv_string_repeat(jv_string("^"), end - loc.start);
+  jv m2 = jv_string_fmt("%s at %s, line %d, column %d:\n    %.*s\n    %*s",
+                        jv_string_value(m1), jv_string_value(l->fname),
+                        startline + 1, loc.start - offset + 1,
                         locfile_line_length(l, startline), l->data + offset,
-                        loc.start - offset, "");
+                        end - offset, jv_string_value(underline));
   jv_free(m1);
+  jv_free(underline);
   jq_report_error(l->jq, m2);
   return;
 }