up and down arrow support + stdlib system

Author: Ricardicus

src/Makefile

@@ -37,6 +37,7 @@ RIC_SOURCES = \
 	interpret \
 	print \
 	prioqueue \
+	stdin \
 	$(LIB_DIR)/libio \
 	$(LIB_DIR)/libmath \
 	$(LIB_DIR)/libstd \

src/ast.h

@@ -586,7 +586,7 @@ typedef struct libFunction {
     intptr_t p;                                            \
     *sb = calloc(sz + 1, sizeof(stackval_t));              \
     assert(*sb != NULL);                                   \
-    p = ((intptr_t) * sb) % sizeof(stackval_t);            \
+    p = ((intptr_t)*sb) % sizeof(stackval_t);              \
     if (p != 0) {                                          \
       p = (sizeof(stackval_t) - (p % sizeof(stackval_t))); \
     }                                                      \
@@ -600,7 +600,7 @@ typedef struct libFunction {
     heapval_t hpbv;                                    \
     *hb = calloc(hz + 2, sizeof(heapval_t));           \
     assert(*hb != NULL);                               \
-    p = ((intptr_t) * hb) % sizeof(heapval_t);         \
+    p = ((intptr_t)*hb) % sizeof(heapval_t);           \
     p = (sizeof(heapval_t) - (p % sizeof(heapval_t))); \
     hpbv.sv.type = INT32TYPE;                          \
     hpbv.sv.i = (int32_t)hz;                           \

src/gram.y

@@ -940,8 +940,7 @@ void runInteractive(int argc, char *argv[], interactiveInterpreterFunc func, int
 
     PRINT_INTERACTIVE_BANNER();
 
-    printf("%s", prompt);
-    while ( fgets(lineBuffer, sizeof(lineBuffer), stdin) != NULL ) {
+    while ( readCommand(lineBuffer, sizeof(lineBuffer), prompt) != NULL ) {
         YY_BUFFER_STATE buffer;
 
         /* Check if the user wants to quit */
@@ -959,7 +958,6 @@ void runInteractive(int argc, char *argv[], interactiveInterpreterFunc func, int
             func(argc, argv, root, 0, stacksize, heapsize);
         }
 
-        printf("%s", prompt);
         memset(lineBuffer, 0, sizeof(lineBuffer));
     }
 }

src/hooks.h

@@ -20,5 +20,6 @@ void runInteractive(int argc, char *argv[], interactiveInterpreterFunc func, int
                     int heapsize, const char *prompt);
 void runCommand(int argc, char *argv[], interactiveInterpreterFunc func, char *command,
                 int stacksize, int heapsize);
+char *readCommand(char *lineBuffer, size_t size, const char *prompt);
 
 #endif

src/lex.yy.c

@@ -1,5 +1,5 @@
 
-#line 2 "lex.yy.c"
+#line 3 "lex.yy.c"
 
 #define  YY_INT_ALIGNED short int
 
@@ -46,7 +46,6 @@ typedef int16_t flex_int16_t;
 typedef uint16_t flex_uint16_t;
 typedef int32_t flex_int32_t;
 typedef uint32_t flex_uint32_t;
-typedef uint64_t flex_uint64_t;
 #else
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
@@ -155,7 +154,7 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 typedef size_t yy_size_t;
 #endif
 
-extern yy_size_t yyleng;
+extern int yyleng;
 
 extern FILE *yyin, *yyout;
 
@@ -198,7 +197,7 @@ struct yy_buffer_state
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -267,8 +266,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
 
 /* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-yy_size_t yyleng;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+int yyleng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = NULL;
@@ -295,7 +294,7 @@ static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file  );
 
 YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size  );
 YY_BUFFER_STATE yy_scan_string ( const char *yy_str  );
-YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, yy_size_t len  );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len  );
 
 void *yyalloc ( yy_size_t  );
 void *yyrealloc ( void *, yy_size_t  );
@@ -351,7 +350,7 @@ static void yynoreturn yy_fatal_error ( const char* msg  );
  */
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
-	yyleng = (yy_size_t) (yy_cp - yy_bp); \
+	yyleng = (int) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
@@ -510,7 +509,7 @@ FILE *yyget_out ( void );
 
 void yyset_out  ( FILE * _out_str  );
 
-			yy_size_t yyget_leng ( void );
+			int yyget_leng ( void );
 
 char *yyget_text ( void );
 
@@ -579,7 +578,7 @@ static int input ( void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		yy_size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -1051,7 +1050,7 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -1065,7 +1064,7 @@ static int yy_get_next_buffer (void)
 
 			if ( b->yy_is_our_buffer )
 				{
-				yy_size_t new_size = b->yy_buf_size * 2;
+				int new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -1123,7 +1122,7 @@ static int yy_get_next_buffer (void)
 
 	if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
 		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
 		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
 			(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size  );
 		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
@@ -1212,7 +1211,7 @@ static int yy_get_next_buffer (void)
 	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		yy_size_t number_to_move = (yy_n_chars) + 2;
+		int number_to_move = (yy_n_chars) + 2;
 		char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
 					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
 		char *source =
@@ -1263,7 +1262,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			int offset = (int) ((yy_c_buf_p) - (yytext_ptr));
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -1632,12 +1631,12 @@ YY_BUFFER_STATE yy_scan_string (const char * yystr )
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, yy_size_t  _yybytes_len )
+YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, int  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	yy_size_t i;
+	int i;
 
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = (yy_size_t) (_yybytes_len + 2);
@@ -1679,7 +1678,7 @@ static void yynoreturn yy_fatal_error (const char* msg )
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-        yy_size_t yyless_macro_arg = (n); \
+        int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\
 		yytext[yyleng] = (yy_hold_char); \
 		(yy_c_buf_p) = yytext + yyless_macro_arg; \
@@ -1719,7 +1718,7 @@ FILE *yyget_out  (void)
 /** Get the length of the current token.
  * 
  */
-yy_size_t yyget_leng  (void)
+int yyget_leng  (void)
 {
         return yyleng;
 }

src/lib.c

@@ -41,6 +41,7 @@ libFunction_t ric_library[] = {
     DECLARE_LIB_FUNCTION("sort", 1, ric_sort),
     DECLARE_LIB_FUNCTION("join", 2, ric_join),
     DECLARE_LIB_FUNCTION("cachepot", 0, ric_cachepot),
+    DECLARE_LIB_FUNCTION("system", 1, ric_system),
     // libjson
     DECLARE_LIB_FUNCTION("jsonLoad", 1, ric_json_load),
     DECLARE_LIB_FUNCTION("jsonConvert", 1, ric_json_convert),

src/library/libstd.c

@@ -1713,3 +1713,32 @@ int ric_get_env(LIBRARY_PARAMS()) {
 
   return 0;
 }
+
+int ric_system(LIBRARY_PARAMS()) {
+  stackval_t stv;
+  char *argText;
+  int result = 0;
+  void *sp = PROVIDE_CONTEXT()->sp;
+  size_t *sc = PROVIDE_CONTEXT()->sc;
+
+  // pop arg 1 - directory to search in
+  POP_VAL(&stv, sp, sc);
+
+  switch (stv.type) {
+    case TEXT:
+      argText = stv.t;
+      break;
+    default: {
+      fprintf(stderr,
+              "error: function call '%s' got unexpected data type as argument, string expected.\n",
+              LIBRARY_FUNC_NAME());
+      exit(1);
+    } break;
+  }
+
+  result = system(argText);
+
+  /* Pushing the result */
+  PUSH_INT(result, sp, sc);
+  return 0;
+}

src/library/libstd.h

@@ -41,5 +41,6 @@ int ric_sort(LIBRARY_PARAMS());
 int ric_join(LIBRARY_PARAMS());
 int ric_cachepot(LIBRARY_PARAMS());
 int ric_get_env(LIBRARY_PARAMS());
+int ric_system(LIBRARY_PARAMS());
 
 #endif

src/meson.build

@@ -44,7 +44,7 @@ if ( target_os == 'windows' )
   deps += [dep]
 
   # Adding windows specific translation units 
-  sources += ['sync_nt.c', 'dl_nt.c']
+  sources += ['stdin_nt.c', 'sync_nt.c', 'dl_nt.c']
 else
 	# Math as depencendy, not needed in MSVC but needed elsewhere
 	mathlib = cc.find_library('m', required: true)
@@ -58,7 +58,7 @@ else
   ric_c_args += ['-Wno-unused-parameter', '-Wno-unused-function', '-Wno-sign-compare']
 
   # Adding POSIX translation units (for darwin, linux etc.)
-  sources += ['sync.c', 'dl.c']
+  sources += ['stdin.c', 'sync.c', 'dl.c']
 endif
 
 subdir('external')

src/sdk_lib/meson.build

@@ -164,7 +164,7 @@ if ( target_os == 'windows' )
   includes += [pcre_inc]
 
   # Adding windows specific translation units 
-  sources += [join_paths('..','sync_nt.c'), join_paths('..','dl_nt.c')]
+  sources += [join_paths('..','stdin_nt.c'), join_paths('..','sync_nt.c'), join_paths('..','dl_nt.c')]
 else
   # Math as depencendy, not needed in MSVC but needed elsewhere
   mathlib = cc.find_library('m', required: true)
@@ -178,7 +178,7 @@ else
   ric_c_args += ['-Wno-unused-parameter', '-Wno-unused-function']
 
   # Adding POSIX translation units (for darwin, linux etc.)
-  sources += [join_paths('..','sync.c'), join_paths('..','dl.c')]
+  sources += [join_paths('..','stdin.c'), join_paths('..','sync.c'), join_paths('..','dl.c')]
 endif
 
 if ( target_os == 'windows' )

src/stdin.c

@@ -0,0 +1,95 @@
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <termios.h>
+
+#define MAX_LINE 128
+#define HISTORY_SIZE 10
+
+static char history[HISTORY_SIZE][MAX_LINE];
+static int history_count = 0;
+static int history_index = -1;
+
+void enable_raw_mode(struct termios *orig_termios) {
+  struct termios raw;
+  tcgetattr(STDIN_FILENO, orig_termios);
+  raw = *orig_termios;
+
+  raw.c_lflag &= ~(ICANON | ECHO); // disable canonical mode & echo
+  tcsetattr(STDIN_FILENO, TCSAFLUSH, &raw);
+}
+
+void disable_raw_mode(struct termios *orig_termios) {
+  tcsetattr(STDIN_FILENO, TCSAFLUSH, orig_termios);
+}
+
+char *readCommand(char *lineBuffer, size_t size, const char *prompt) {
+  struct termios orig_termios;
+  enable_raw_mode(&orig_termios);
+
+  int pos = 0;
+  int c;
+  lineBuffer[0] = '\0';
+  printf("%s", prompt);
+  fflush(stdout);
+
+  while (1) {
+    c = getchar();
+
+    if (c == 27) { // ESC
+      if (getchar() == '[') {
+        c = getchar();
+        if (c == 'A') { // UP
+          if (history_count > 0 && history_index < history_count - 1) {
+            history_index++;
+            strcpy(lineBuffer, history[history_count - 1 - history_index]);
+            printf("\r%s%s\033[K", prompt, lineBuffer);
+            pos = strlen(lineBuffer);
+            fflush(stdout);
+          }
+        } else if (c == 'B') { // DOWN
+          if (history_index > 0) {
+            history_index--;
+            strcpy(lineBuffer, history[history_count - 1 - history_index]);
+            printf("\r%s%s\033[K", prompt, lineBuffer);
+            pos = strlen(lineBuffer);
+            fflush(stdout);
+          } else if (history_index == 0) {
+            history_index = -1;
+            lineBuffer[0] = '\0';
+            printf("\r%s\033[K", prompt);
+            pos = 0;
+            fflush(stdout);
+          }
+        }
+      }
+    } else if (c == '\n') {
+      break;
+    } else if (c == 127 || c == '\b') { // Backspace
+      if (pos > 0) {
+        pos--;
+        lineBuffer[pos] = '\0';
+        printf("\r%s%s \b\033[K", prompt, lineBuffer);
+        fflush(stdout);
+      }
+    } else if (pos < size - 1) {
+      lineBuffer[pos++] = c;
+      lineBuffer[pos] = '\0';
+      putchar(c);
+      fflush(stdout);
+    }
+  }
+
+  printf("\n");
+  disable_raw_mode(&orig_termios);
+
+  // Save to history
+  if (lineBuffer[0] != '\0') {
+    if (history_count < HISTORY_SIZE) {
+      strcpy(history[history_count++], lineBuffer);
+    }
+  }
+  history_index = -1;
+
+  return lineBuffer;
+}