COMMON: Unitfy HASH and UDS

Author: chrisws

src/common/scan.c

@@ -642,7 +642,7 @@ bid_t comp_var_getID(const char *var_name) {
   comp_prepare_name(tmp, baseof(var_name, '/'), SB_KEYWORD_SIZE);
 
   char *dot = strchr(tmp, '.');
-  if (dot != 0 && *(dot + 1) == 0) {
+  if (dot != NULL && *(dot + 1) == 0) {
     // name ends with dot
     sc_raise(MSG_MEMBER_DOES_NOT_EXISTS, tmp);
     return 0;
@@ -654,7 +654,7 @@ bid_t comp_var_getID(const char *var_name) {
   //
   // If the name is not found in comp_libtable then it
   // is treated as a structure reference
-  if (dot != 0 && comp_check_lib(tmp)) {
+  if (dot != NULL && comp_check_lib(tmp)) {
     for (i = 0; i < comp_varcount; i++) {
       if (strcmp(comp_vartable[i].name, tmp) == 0) {
         return i;
@@ -709,7 +709,7 @@ bid_t comp_var_getID(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)) {
+  if (dot != NULL && !comp_check_lib(var_name)) {
     // uds-element (or sub-element eg foo.x.y.z)
     // record the uds-parent
 
@@ -4038,7 +4038,13 @@ int comp_pass1(const char *section, const char *text) {
     for (i = 0; i < comp_udpcount; i++) {
       if (comp_udptable[i].ip == INVALID_ADDR) {
         comp_line = comp_udptable[i].pline;
-        sc_raise(MSG_UNDEFINED_UDP, comp_udptable[i].name);
+        char *dot = strchr(comp_udptable[i].name, '.');
+        if (dot) {
+          sc_raise(MSG_UNDEFINED_HASH, comp_udptable[i].name);
+        } else {
+          sc_raise(MSG_UNDEFINED_UDP, comp_udptable[i].name);
+        }
+        break;
       }
     }
   }

src/common/var.h

@@ -72,9 +72,6 @@
 extern "C" {
 #endif
 
-// the following prototype is declared later below
-typedef struct uds_field_s uds_field_s;
-
 /**
  * @ingroup var
  * @typedef var_s
@@ -96,9 +93,6 @@ struct var_s {
       addr_t v; /** return-var ID */
     } ap;
 
-    // user defined structure
-    uds_field_s *uds; /** pointer to the "structure" */
-
     // hash map
     void* hash; /** pointer the hash structure */
 
@@ -123,16 +117,6 @@ struct var_s {
 typedef struct var_s var_t;
 typedef var_t *var_p_t;
 
-/*
- * user defined structures
- */
-struct uds_field_s {
-  uds_field_s *next;          // next structure element
-  addr_t field_id;            // the element id
-  var_p_t var;                // the variable
-  byte var_owner_flag;        // whether var is owned by this node
-};
-
 /*
  * label
  */

src/languages/messages.en.h

@@ -103,6 +103,7 @@
 #define MSG_PASS1               "Pass1...\n"
 #define MSG_PASS1_COUNT         "\rPASS1: Line %d"
 #define MSG_UNDEFINED_UDP       "Undefined SUB/FUNC code: %s"
+#define MSG_UNDEFINED_HASH      "Undefined HASH: %s, (Use DIM)"
 #define MSG_PASS1_FIN           "\rPASS1: Line %d; finished\n"
 #define MSG_EXP_SYM_NOT_FOUND   "Export symbol '%s' not found"
 #define MSG_PASS2               "PASS2..."