COMMON: code cleanup

Author: chrisws

ChangeLog

@@ -1,6 +1,7 @@
 2014-08-22
 	Fix HASH var crash
 	Fix HASH var handling of mixed types
+	Fix illegal UDS field variable names
 
 2014-08-15
 	Improved runtime performance

src/common/bc.c

@@ -114,7 +114,7 @@ void bc_add2i(bc_t *bc, byte code, word p1) {
 /*
  * add one command and one long int (32 bits)
  */
-void bc_add2l(bc_t * bc, byte code, long p1) {
+void bc_add2l(bc_t *bc, byte code, long p1) {
   if (bc->count >= bc->size - 8) {
     bc_resize(bc, bc->size + BC_ALLOC_INCR);
   }
@@ -207,19 +207,17 @@ void bc_add_creal(bc_t *bc, var_num_t v) {
 /*
  * add one command and one string (see: bc_store_string)
  */
-void bc_add2s(bc_t *bc, byte code, const char *p1) {
-  int l = strlen(p1);
-  if (l > BC_MAX_STORE_SIZE) {
+void bc_add_strn(bc_t *bc, const char *str, int len) {
+  if (len > BC_MAX_STORE_SIZE) {
     sc_raise("STRING TOO BIG");
   } else {
-    bc_add_code(bc, code);
-    bc_add_dword(bc, l);
-
-    if (bc->count >= bc->size - l) {
+    bc_add_code(bc, kwTYPE_STR);
+    bc_add_dword(bc, len);
+    if (bc->count >= bc->size - len) {
       bc_resize(bc, bc->size + BC_ALLOC_INCR);
     }
-    memcpy(bc->ptr + bc->count, p1, l);
-    bc->count += l;
+    memcpy(bc->ptr + bc->count, str, len);
+    bc->count += len;
   }
 }
 
@@ -255,11 +253,11 @@ char *bc_store_string(bc_t *bc, char *src) {
         char *cstr;
         cstr = cstrdup(np);
         tmp_free(np);
-        bc_add2s(bc, kwTYPE_STR, cstr);
+        bc_add_strn(bc, cstr, strlen(cstr));
         tmp_free(cstr);
       } else {
         // normal
-        bc_add2s(bc, kwTYPE_STR, np);
+        bc_add_strn(bc, np, strlen(np));
         tmp_free(np);
       }
       p++;
@@ -285,7 +283,7 @@ char *bc_store_macro(bc_t *bc, char *src) {
       np = tmp_alloc(l + 1);
       strncpy(np, src + 1, l);
       np[l - 1] = '\0';
-      bc_add2s(bc, kwTYPE_STR, np);
+      bc_add_strn(bc, np, strlen(np));
       tmp_free(np);
 
       p++;

src/common/bc.h

@@ -48,7 +48,7 @@ void sc_raise(const char *fmt, ...);
  *
  * @param bc the bc structure
  */
-void bc_create(bc_t * bc);
+void bc_create(bc_t *bc);
 
 /**
  * @ingroup scan
@@ -57,7 +57,7 @@ void bc_create(bc_t * bc);
  *
  * @param bc the bc structure
  */
-void bc_destroy(bc_t * bc);
+void bc_destroy(bc_t *bc);
 
 /**
  * @ingroup scan
@@ -67,7 +67,7 @@ void bc_destroy(bc_t * bc);
  * @param bc the bc structure
  * @param newsize the new size
  */
-void bc_resize(bc_t * bc, dword newsize);
+void bc_resize(bc_t *bc, dword newsize);
 
 /**
  * @ingroup scan
@@ -77,7 +77,7 @@ void bc_resize(bc_t * bc, dword newsize);
  * @param bc the bc structure
  * @param code the byte
  */
-void bc_add1(bc_t * bc, byte code);
+void bc_add1(bc_t *bc, byte code);
 
 /**
  * @ingroup scan
@@ -87,7 +87,7 @@ void bc_add1(bc_t * bc, byte code);
  * @param bc the bc structure
  * @param code the byte
  */
-void bc_store1(bc_t * bc, addr_t offset, byte code);
+void bc_store1(bc_t *bc, addr_t offset, byte code);
 
 /**
  * @ingroup scan
@@ -97,7 +97,7 @@ void bc_store1(bc_t * bc, addr_t offset, byte code);
  * @param bc the bc structure
  * @param code the word
  */
-void bc_add_word(bc_t * bc, word code);
+void bc_add_word(bc_t *bc, word code);
 
 /**
  * @ingroup scan
@@ -107,7 +107,14 @@ void bc_add_word(bc_t * bc, word code);
  * @param bc the bc structure
  * @param code the dword
  */
-void bc_add_dword(bc_t * bc, dword code);
+void bc_add_dword(bc_t *bc, dword code);
+
+/**
+ * @ingroup scan
+ *
+ * adds a string of the given length
+ */
+void bc_add_strn(bc_t *bc, const char *str, int len);
 
 /**
  * @ingroup scan
@@ -118,7 +125,7 @@ void bc_add_dword(bc_t * bc, dword code);
  * @param str the raw-string. the string must starts with \". the string must also contains the ending \".
  * @return a pointer of src to the next character after the second \"
  */
-char *bc_store_string(bc_t * bc, char *src);
+char *bc_store_string(bc_t *bc, char *src);
 
 /**
  * @ingroup scan
@@ -129,7 +136,7 @@ char *bc_store_string(bc_t * bc, char *src);
  * @param str the raw-string. the string must starts with `. the string must also contains the ending `.
  * @return a pointer of src to the next character after the second `
  */
-char *bc_store_macro(bc_t * bc, char *src);
+char *bc_store_macro(bc_t *bc, char *src);
 
 /**
  * @ingroup scan
@@ -138,7 +145,7 @@ char *bc_store_macro(bc_t * bc, char *src);
  *
  * @param bc the bc structure
  */
-void bc_eoc(bc_t * bc);
+void bc_eoc(bc_t *bc);
 
 /**
  * @ingroup scan
@@ -148,7 +155,7 @@ void bc_eoc(bc_t * bc);
  * @param dest the destination
  * @param src the code to be appended to dest
  */
-void bc_append(bc_t * dest, bc_t * src);
+void bc_append(bc_t *dest, bc_t *src);
 
 /**
  * @ingroup scan
@@ -159,7 +166,7 @@ void bc_append(bc_t * dest, bc_t * src);
  * @param src the code to be appended to dest
  * @param n the size of the src to be copied
  */
-void bc_add_n(bc_t * dest, byte * src, dword n);
+void bc_add_n(bc_t *dest, byte *src, dword n);
 
 /**
  * @ingroup scan
@@ -175,7 +182,7 @@ void bc_add_n(bc_t * dest, byte * src, dword n);
  * @param dest the bc segment
  * @param idx the index of the function
  */
-void bc_add_fcode(bc_t * dest, long idx);
+void bc_add_fcode(bc_t *dest, long idx);
 
 /**
  * @ingroup scan
@@ -185,7 +192,7 @@ void bc_add_fcode(bc_t * dest, long idx);
  * @param dest the bc segment
  * @param idx the index of the procedure
  */
-void bc_add_pcode(bc_t * dest, long idx);
+void bc_add_pcode(bc_t *dest, long idx);
 
 /**
  * @ingroup scan
@@ -196,7 +203,7 @@ void bc_add_pcode(bc_t * dest, long idx);
  * @param lib the index of the library
  * @param idx the index of the function
  */
-void bc_add_extfcode(bc_t * dest, int lib, long idx);
+void bc_add_extfcode(bc_t *dest, int lib, long idx);
 
 /**
  * @ingroup scan
@@ -207,7 +214,7 @@ void bc_add_extfcode(bc_t * dest, int lib, long idx);
  * @param lib the index of the library
  * @param idx the index of the procedure
  */
-void bc_add_extpcode(bc_t * dest, int lib, long idx);
+void bc_add_extpcode(bc_t *dest, int lib, long idx);
 
 /**
  * @ingroup scan
@@ -217,7 +224,7 @@ void bc_add_extpcode(bc_t * dest, int lib, long idx);
  * @param bc the bc segment
  * @param idx the address
  */
-void bc_add_addr(bc_t * bc, addr_t idx);
+void bc_add_addr(bc_t *bc, addr_t idx);
 
 /**
  * @ingroup scan
@@ -229,7 +236,7 @@ void bc_add_addr(bc_t * bc, addr_t idx);
  * @param true_ip the jump-address when on true
  * @param false_ip the jump-address when on false
  */
-void bc_add_ctrl(bc_t * bc, code_t code, addr_t true_ip, addr_t false_ip);
+void bc_add_ctrl(bc_t *bc, code_t code, addr_t true_ip, addr_t false_ip);
 
 /**
  * @ingroup scan
@@ -239,7 +246,7 @@ void bc_add_ctrl(bc_t * bc, code_t code, addr_t true_ip, addr_t false_ip);
  * @param bc the bc segment
  * @param v the number
  */
-void bc_add_creal(bc_t * bc, var_num_t v);
+void bc_add_creal(bc_t *bc, var_num_t v);
 
 /**
  * @ingroup scan
@@ -249,6 +256,6 @@ void bc_add_creal(bc_t * bc, var_num_t v);
  * @param bc the bc segment
  * @param v the number
  */
-void bc_add_cint(bc_t * bc, var_int_t v);
+void bc_add_cint(bc_t *bc, var_int_t v);
 
 #endif

src/common/eval.c

@@ -27,7 +27,7 @@
 /**
  * matrix: convert var_t to double[r][c]
  */
-var_num_t* mat_toc(var_t *v, int32 *rows, int32 *cols) {
+var_num_t *mat_toc(var_t *v, int32 *rows, int32 *cols) {
   int i, j, pos;
   var_t *e;
   var_num_t *m;
@@ -69,7 +69,7 @@ var_num_t* mat_toc(var_t *v, int32 *rows, int32 *cols) {
 /**
  * matrix: conv. double[nr][nc] to var_t
  */
-void mat_tov(var_t * v, var_num_t *m, int rows, int cols, int protect_col1) {
+void mat_tov(var_t *v, var_num_t *m, int rows, int cols, int protect_col1) {
   var_t *e;
   int i, j, pos;
 

src/common/fs_stream.c

@@ -100,7 +100,6 @@ int stream_write(dev_file_t *f, byte *data, dword size) {
 
   r = write(f->handle, data, size);
   if (r != (int) size) {
-    fprintf(stderr, "error result =%d %d\n", r, size);
     err_file((f->last_error = errno));
   }
   return (r == (int) size);

src/common/scan.c

@@ -19,10 +19,10 @@
 #include "common/messages.h"
 #include "languages/keywords.en.c"
 
-char *comp_array_uds_field(char *p, bc_t * bc);
+char *comp_array_uds_field(char *p, bc_t *bc);
 void comp_text_line(char *text);
 addr_t comp_search_bc(addr_t ip, code_t code);
-extern void expr_parser(bc_t * bc);
+extern void expr_parser(bc_t *bc);
 extern void sc_raise2(const char *fmt, int line, const char *buff); // sberr
 
 #define STRLEN(s) ((sizeof(s) / sizeof(s[0])) - 1)
@@ -574,14 +574,14 @@ int comp_check_lib(const char *name) {
   return 0;
 }
 
-/*
+/**
+ * create a new variable
  */
 int comp_create_var(const char *name) {
   int idx = -1;
-
-  if (!(is_alpha(name[0]) || name[0] == '_'))
+  if (!(is_alpha(name[0]) || name[0] == '_')) {
     sc_raise(MSG_WRONG_VARNAME, name);
-  else {
+  } else {
     // realloc table if it is needed
     if (comp_varcount >= comp_varsize) {
       comp_varsize += GROWSIZE;
@@ -600,7 +600,8 @@ int comp_create_var(const char *name) {
   return idx;
 }
 
-/*
+/**
+ * add external variable
  */
 int comp_add_external_var(const char *name, int lib_id) {
   int idx;
@@ -729,13 +730,19 @@ int comp_get_uds_field_id(const char *field_name, int len) {
     }
   }
 
+  int result;
   strncpy(uds.name, field_name, len);
-  uds.name[len] = 0;
-  uds.field_id = ++comp_next_field_id;
-  dbt_write(comp_udstable, comp_udscount, &uds, sizeof(comp_struct_t));
-  comp_udscount++;
-
-  return uds.field_id;
+  if (!(is_alpha(uds.name[0]) || uds.name[0] == '_')) {
+    sc_raise(MSG_WRONG_VARNAME, uds.name);
+    result = -1;
+  } else {
+    uds.name[len] = 0;
+    uds.field_id = ++comp_next_field_id;
+    dbt_write(comp_udstable, comp_udscount, &uds, sizeof(comp_struct_t));
+    comp_udscount++;
+    result = uds.field_id;
+  }
+  return result;
 }
 
 /*
@@ -745,7 +752,7 @@ int comp_get_uds_field_id(const char *field_name, int len) {
  * then the foo variable is added as kwTYPE_UDS.
  * 
  */
-void comp_add_variable(bc_t * bc, const char *var_name) {
+void comp_add_variable(bc_t *bc, const char *var_name) {
   char *dot = strchr(var_name, '.');
 
   if (dot != 0 && !comp_check_lib(var_name)) {
@@ -779,7 +786,6 @@ void comp_add_variable(bc_t * bc, const char *var_name) {
       bc_add_code(bc, kwTYPE_UDS_EL);
       bc_add_addr(bc, var_id);
     }
-
   } else if (comp_check_uds(var_name)) {
     // uds-container
     // all of var_name same as dot-less portion of existing variable

src/common/var.c

@@ -499,7 +499,6 @@ void v_set(var_t *dest, const var_t *src) {
     return;
   } else if (dest->type == V_HASH) {
     // lvalue struct assigned to non-struct rvalue
-    fprintf(stderr, "hash_clear\n");
     hash_clear(dest);
     return;
   }

src/common/var_uds.c

@@ -118,8 +118,13 @@ var_p_t uds_resolve_fields(const var_p_t var_p) {
     addr_t field_id = code_getaddr();
 
     if (var_p->type != V_UDS) {
-      v_free(var_p);
-      var_p->type = V_UDS;
+      if (v_is_nonzero(var_p)) {
+        err_typemismatch();
+        return NULL;
+      } else {
+        v_free(var_p);
+        var_p->type = V_UDS;
+      }
     }
 
     uds_field_s *next = var_p->v.uds;