Fixed bug related to variable declaration

README.md

@@ -10,7 +10,7 @@
 
 <p align="center">
 <img src="https://img.shields.io/badge/stability-stable-green.svg">
-<img src="https://img.shields.io/badge/version-2.6-blue.svg">
+<img src="https://img.shields.io/badge/version-2.6.1-blue.svg">
 <img src="https://img.shields.io/badge/license-MIT-orange.svg">
 </p>
 

src/main.h

@@ -1,7 +1,7 @@
 #ifndef MAIN_H_
 #define MAIN_H_
 #define OPERATION_BUFFER 512
-#define VERSION_MSG "QUICH v2.6\n"
+#define VERSION_MSG "QUICH v2.6.1\n"
 #define INPUT_LINE "> "
 #define DEFINITION_MSG "(definition)\n"
 #define STATEMENT_SEPARATOR ";"

src/parser.c

@@ -198,9 +198,9 @@ static double getValue(const char *str)
 }
 
 
-static double getOperationResult(const char *operator,
-                                 const char *a,
-                                 const char *b)
+static double getOpResult(const char *operator,
+                          const char *a,
+                          const char *b)
 {
     double x = 0, y = 0;
 
@@ -372,7 +372,7 @@ static void pushResult(struct list *list, const struct token *node)
         x = pop(list);
     }
 
-    result = getOperationResult(node->value, x, y);
+    result = getOpResult(node->value, x, y);
     if (precision >= 0) {
         result = round_(result, precision);
     }
@@ -426,6 +426,20 @@ static double getPostfixResult(const struct list *postfix)
 }
 
 
+static void replaceVariable(const char *key, const char *val)
+{
+    struct variable *node = variables_first;
+
+    while (node != NULL) {
+        if (!strcmp(key, node->key)) {
+            strncpy_(node->value, val, strlen(val) + 1);
+        }
+
+        node = node->next;
+    }
+}
+
+
 void addVariable(const char *key, const char *val)
 {
     struct variable *node;
@@ -435,18 +449,8 @@ void addVariable(const char *key, const char *val)
         return;
     }
 
-    /* Replace value for an existing variable */
     if (isVariable(key)) {
-        node = variables_first;
-
-        while (node != NULL) {
-            if (!strcmp(key, node->key)) {
-                strncpy_(node->value, val, strlen(val) + 1);
-            }
-
-            node = node->next;
-        }
-
+        replaceVariable(key, val);
         return;
     }
 

src/tokenizer.c

@@ -29,7 +29,8 @@ static enum TOKEN_TYPE getType(const char ch)
     if (ch == '(' || ch == ')' ||
         ch == '+' || ch == '-' ||
         ch == '/' || ch == '*' ||
-        ch == '^' || ch == '!') {
+        ch == '^' || ch == '!' ||
+        ch == '=') {
         return Operator;
     }
 
@@ -38,10 +39,6 @@ static enum TOKEN_TYPE getType(const char ch)
         return Word;
     }
 
-    if (ch == '=') {
-        return Equal;
-    }
-
     return None;
 }
 

src/tokenizer.h

@@ -8,7 +8,6 @@ enum TOKEN_TYPE {
     Operand,
     Operator,
     Word,
-    Equal,
     None
 };