Better error message.

author: David Walter Seikel 2012-01-17 11:40:47 +1000
committer: David Walter Seikel 2012-01-17 11:40:47 +1000
commit: f7d9fcc2158f6f1f15ea87a9e302a1afe1cb4c0d (patch)
tree: e8f37b4d7b3860e0985ae1f3faaa54d65003826e /LuaSL
parent: More identifier hacking. (diff)
download: SledjHamr-f7d9fcc2158f6f1f15ea87a9e302a1afe1cb4c0d.zip
SledjHamr-f7d9fcc2158f6f1f15ea87a9e302a1afe1cb4c0d.tar.gz
SledjHamr-f7d9fcc2158f6f1f15ea87a9e302a1afe1cb4c0d.tar.bz2
SledjHamr-f7d9fcc2158f6f1f15ea87a9e302a1afe1cb4c0d.tar.xz
2 files changed, 41 insertions, 40 deletions
diff --git a/LuaSL/src/LuaSL_LSL_tree.c b/LuaSL/src/LuaSL_LSL_tree.c
index 3d53ed7..2a9d5d6 100644
--- a/LuaSL/src/LuaSL_LSL_tree.c
+++ b/LuaSL/src/LuaSL_LSL_tree.c
@@ -131,38 +131,38 @@ LSL_Token LSL_Tokens[] =
 allowedTypes allowed[] = 
 {
-    {OT_nothing,        (ST_NONE)},
+    {OT_nothing,        "nothing",      (ST_NONE)},
-    {OT_bool,           (ST_BOOL_NOT)},
+    {OT_bool,           "boolean",      (ST_BOOL_NOT)},
-    {OT_integer,        (ST_BIT_NOT | ST_NEGATE)},
+    {OT_integer,        "integer",      (ST_BIT_NOT | ST_NEGATE)},
-    {OT_float,          (ST_NONE)},
+    {OT_float,          "float",        (ST_NONE)},
-    {OT_key,            (ST_NONE)},
+    {OT_key,            "key",          (ST_NONE)},
-    {OT_list,           (ST_NONE)},
+    {OT_list,           "list",         (ST_NONE)},
-    {OT_rotation,       (ST_NONE)},
+    {OT_rotation,       "rotation",     (ST_NONE)},
-    {OT_string,         (ST_NONE)},
+    {OT_string,         "string",       (ST_NONE)},
-    {OT_vector,         (ST_NONE)},
+    {OT_vector,         "vector",       (ST_NONE)},
-    {OT_other,          (ST_NONE)},
+    {OT_other,          "other",        (ST_NONE)},
-    {OT_bool,           (ST_BOOLEAN | ST_EQUALITY)},
+    {OT_bool,           "boolean",      (ST_BOOLEAN | ST_EQUALITY)},
-    {OT_integer,        (ST_MULTIPLY | ST_ADD | ST_SUBTRACT | ST_EQUALITY | ST_COMPARISON | ST_CONCATENATION | ST_ASSIGNMENT | ST_MODULO | ST_BITWISE)},
+    {OT_integer,        "integer",      (ST_MULTIPLY | ST_ADD | ST_SUBTRACT | ST_EQUALITY | ST_COMPARISON | ST_CONCATENATION | ST_ASSIGNMENT | ST_MODULO | ST_BITWISE)},
-    {OT_float,          (ST_MULTIPLY | ST_ADD | ST_SUBTRACT | ST_EQUALITY | ST_COMPARISON | ST_CONCATENATION | ST_ASSIGNMENT)},
+    {OT_float,          "float",        (ST_MULTIPLY | ST_ADD | ST_SUBTRACT | ST_EQUALITY | ST_COMPARISON | ST_CONCATENATION | ST_ASSIGNMENT)},
-    {OT_float,          (ST_MULTIPLY | ST_ADD | ST_SUBTRACT | ST_EQUALITY | ST_COMPARISON | ST_CONCATENATION | ST_ASSIGNMENT)},
+    {OT_float,          "float",        (ST_MULTIPLY | ST_ADD | ST_SUBTRACT | ST_EQUALITY | ST_COMPARISON | ST_CONCATENATION | ST_ASSIGNMENT)},
-    {OT_float,          (ST_MULTIPLY | ST_ADD | ST_SUBTRACT | ST_EQUALITY | ST_COMPARISON | ST_CONCATENATION | ST_ASSIGNMENT)},
+    {OT_float,          "float",        (ST_MULTIPLY | ST_ADD | ST_SUBTRACT | ST_EQUALITY | ST_COMPARISON | ST_CONCATENATION | ST_ASSIGNMENT)},
-    {OT_string,         (ST_ADD | ST_EQUALITY | ST_CONCATENATION)},
+    {OT_string,         "string",       (ST_ADD | ST_EQUALITY | ST_CONCATENATION)},
-    {OT_string,         (ST_ADD | ST_EQUALITY | ST_CONCATENATION)},
+    {OT_string,         "string",       (ST_ADD | ST_EQUALITY | ST_CONCATENATION)},
-    {OT_string,         (ST_ADD | ST_EQUALITY | ST_CONCATENATION)},
+    {OT_string,         "string",       (ST_ADD | ST_EQUALITY | ST_CONCATENATION)},
-    {OT_list,           (ST_ADD | ST_EQUALITY | ST_CONCATENATION)},
+    {OT_list,           "list",         (ST_ADD | ST_EQUALITY | ST_CONCATENATION)},
-    {OT_list,           (ST_ADD | ST_COMPARISON | ST_CONCATENATION)},
+    {OT_list,           "list",         (ST_ADD | ST_COMPARISON | ST_CONCATENATION)},
-    {OT_list,           (ST_ADD | ST_COMPARISON | ST_CONCATENATION)},
+    {OT_list,           "list",         (ST_ADD | ST_COMPARISON | ST_CONCATENATION)},
-    {OT_integer,        (ST_ADD | ST_COMPARISON)},
+    {OT_integer,        "integer",      (ST_ADD | ST_COMPARISON)},
-    {OT_float,          (ST_ADD | ST_COMPARISON)},
+    {OT_float,          "float",        (ST_ADD | ST_COMPARISON)},
-    {OT_list,           (ST_ADD | ST_CONCATENATION)},
+    {OT_list,           "list",         (ST_ADD | ST_CONCATENATION)},
-    {OT_vector,         (ST_MULTIPLY | ST_ADD | ST_SUBTRACT | ST_EQUALITY | ST_CONCATENATION | ST_ASSIGNMENT | ST_MODULO)},
+    {OT_vector,         "vector",       (ST_MULTIPLY | ST_ADD | ST_SUBTRACT | ST_EQUALITY | ST_CONCATENATION | ST_ASSIGNMENT | ST_MODULO)},
-    {OT_vector,         (ST_MULTIPLY)},
+    {OT_vector,         "vector",       (ST_MULTIPLY)},
-    {OT_vector,         (ST_MULTIPLY)},
+    {OT_vector,         "vector",       (ST_MULTIPLY)},
-    {OT_rotation,       (ST_MULTIPLY | ST_ADD | ST_SUBTRACT | ST_EQUALITY | ST_CONCATENATION | ST_ASSIGNMENT)},
+    {OT_rotation,       "rotation",     (ST_MULTIPLY | ST_ADD | ST_SUBTRACT | ST_EQUALITY | ST_CONCATENATION | ST_ASSIGNMENT)},
-    {OT_other,          (ST_NONE)},
+    {OT_other,          "other",        (ST_NONE)},
-    {OT_invalid,        (ST_NONE)}
+    {OT_invalid,        "invalid",      (ST_NONE)}
 };
 opType opExpr[][10] =
@@ -277,14 +277,14 @@ LSL_Leaf *addOperation(LSL_Leaf *left, LSL_Leaf *lval, LSL_Leaf *right)
        }
        if (OT_invalid == lval->basicType)
        {
-            if ((left) && (right))
+            char *leftType = "", *rightType = "";
-                fprintf(stderr, "Invalid operation [%s %s %s] type at line %d column %d\n", left->token->token, lval->token->token, right->token->token, lval->line, lval->column);
-            else if (left)
+            if (left)
-                fprintf(stderr, "Invalid operation [%s %s] type at line %d column %d\n", left->token->token, lval->token->token, lval->line, lval->column);
+                leftType = allowed[left->basicType].name;
-            else if (left)
+            if (right)
-                fprintf(stderr, "Invalid operation [%s %s] type at line %d column %d\n", lval->token->token, right->token->token, lval->line, lval->column);
+                rightType = allowed[right->basicType].name;
-            else
-                fprintf(stderr, "Invalid operation [%s] type at line %d column %d\n", lval->token->token, lval->line, lval->column);
+            fprintf(stderr, "Invalid operation [%s %s %s] @ line %d column %d\n", leftType, lval->token->token, rightType, lval->line, lval->column);
        }
    }
diff --git a/LuaSL/src/LuaSL_LSL_tree.h b/LuaSL/src/LuaSL_LSL_tree.h
index c33d77d..84610b6 100644
--- a/LuaSL/src/LuaSL_LSL_tree.h
+++ b/LuaSL/src/LuaSL_LSL_tree.h
@@ -160,6 +160,7 @@ typedef enum
 struct _allowedTypes
 {
    opType      result;
+    char        *name;
    int         subTypes;
 };
author	David Walter Seikel	2012-01-17 11:40:47 +1000
committer	David Walter Seikel	2012-01-17 11:40:47 +1000
commit	f7d9fcc2158f6f1f15ea87a9e302a1afe1cb4c0d (patch)
tree	e8f37b4d7b3860e0985ae1f3faaa54d65003826e /LuaSL
parent	More identifier hacking. (diff)
download	SledjHamr-f7d9fcc2158f6f1f15ea87a9e302a1afe1cb4c0d.zip SledjHamr-f7d9fcc2158f6f1f15ea87a9e302a1afe1cb4c0d.tar.gz SledjHamr-f7d9fcc2158f6f1f15ea87a9e302a1afe1cb4c0d.tar.bz2 SledjHamr-f7d9fcc2158f6f1f15ea87a9e302a1afe1cb4c0d.tar.xz

diff --git a/LuaSL/src/LuaSL_LSL_tree.c b/LuaSL/src/LuaSL_LSL_tree.c index 3d53ed7..2a9d5d6 100644 --- a/LuaSL/src/LuaSL_LSL_tree.c +++ b/LuaSL/src/LuaSL_LSL_tree.c
@@ -131,38 +131,38 @@ LSL_Token LSL_Tokens[] =
131		131
132	allowedTypes allowed[] =	132	allowedTypes allowed[] =
133	{	133	{
134	{OT_nothing, (ST_NONE)},	134	{OT_nothing, "nothing", (ST_NONE)},
135		135
136	{OT_bool, (ST_BOOL_NOT)},	136	{OT_bool, "boolean", (ST_BOOL_NOT)},
137	{OT_integer, (ST_BIT_NOT \| ST_NEGATE)},	137	{OT_integer, "integer", (ST_BIT_NOT \| ST_NEGATE)},
138	{OT_float, (ST_NONE)},	138	{OT_float, "float", (ST_NONE)},
139	{OT_key, (ST_NONE)},	139	{OT_key, "key", (ST_NONE)},
140	{OT_list, (ST_NONE)},	140	{OT_list, "list", (ST_NONE)},
141	{OT_rotation, (ST_NONE)},	141	{OT_rotation, "rotation", (ST_NONE)},
142	{OT_string, (ST_NONE)},	142	{OT_string, "string", (ST_NONE)},
143	{OT_vector, (ST_NONE)},	143	{OT_vector, "vector", (ST_NONE)},
144	{OT_other, (ST_NONE)},	144	{OT_other, "other", (ST_NONE)},
145		145
146	{OT_bool, (ST_BOOLEAN \| ST_EQUALITY)},	146	{OT_bool, "boolean", (ST_BOOLEAN \| ST_EQUALITY)},
147	{OT_integer, (ST_MULTIPLY \| ST_ADD \| ST_SUBTRACT \| ST_EQUALITY \| ST_COMPARISON \| ST_CONCATENATION \| ST_ASSIGNMENT \| ST_MODULO \| ST_BITWISE)},	147	{OT_integer, "integer", (ST_MULTIPLY \| ST_ADD \| ST_SUBTRACT \| ST_EQUALITY \| ST_COMPARISON \| ST_CONCATENATION \| ST_ASSIGNMENT \| ST_MODULO \| ST_BITWISE)},
148	{OT_float, (ST_MULTIPLY \| ST_ADD \| ST_SUBTRACT \| ST_EQUALITY \| ST_COMPARISON \| ST_CONCATENATION \| ST_ASSIGNMENT)},	148	{OT_float, "float", (ST_MULTIPLY \| ST_ADD \| ST_SUBTRACT \| ST_EQUALITY \| ST_COMPARISON \| ST_CONCATENATION \| ST_ASSIGNMENT)},
149	{OT_float, (ST_MULTIPLY \| ST_ADD \| ST_SUBTRACT \| ST_EQUALITY \| ST_COMPARISON \| ST_CONCATENATION \| ST_ASSIGNMENT)},	149	{OT_float, "float", (ST_MULTIPLY \| ST_ADD \| ST_SUBTRACT \| ST_EQUALITY \| ST_COMPARISON \| ST_CONCATENATION \| ST_ASSIGNMENT)},
150	{OT_float, (ST_MULTIPLY \| ST_ADD \| ST_SUBTRACT \| ST_EQUALITY \| ST_COMPARISON \| ST_CONCATENATION \| ST_ASSIGNMENT)},	150	{OT_float, "float", (ST_MULTIPLY \| ST_ADD \| ST_SUBTRACT \| ST_EQUALITY \| ST_COMPARISON \| ST_CONCATENATION \| ST_ASSIGNMENT)},
151	{OT_string, (ST_ADD \| ST_EQUALITY \| ST_CONCATENATION)},	151	{OT_string, "string", (ST_ADD \| ST_EQUALITY \| ST_CONCATENATION)},
152	{OT_string, (ST_ADD \| ST_EQUALITY \| ST_CONCATENATION)},	152	{OT_string, "string", (ST_ADD \| ST_EQUALITY \| ST_CONCATENATION)},
153	{OT_string, (ST_ADD \| ST_EQUALITY \| ST_CONCATENATION)},	153	{OT_string, "string", (ST_ADD \| ST_EQUALITY \| ST_CONCATENATION)},
154	{OT_list, (ST_ADD \| ST_EQUALITY \| ST_CONCATENATION)},	154	{OT_list, "list", (ST_ADD \| ST_EQUALITY \| ST_CONCATENATION)},
155	{OT_list, (ST_ADD \| ST_COMPARISON \| ST_CONCATENATION)},	155	{OT_list, "list", (ST_ADD \| ST_COMPARISON \| ST_CONCATENATION)},
156	{OT_list, (ST_ADD \| ST_COMPARISON \| ST_CONCATENATION)},	156	{OT_list, "list", (ST_ADD \| ST_COMPARISON \| ST_CONCATENATION)},
157	{OT_integer, (ST_ADD \| ST_COMPARISON)},	157	{OT_integer, "integer", (ST_ADD \| ST_COMPARISON)},
158	{OT_float, (ST_ADD \| ST_COMPARISON)},	158	{OT_float, "float", (ST_ADD \| ST_COMPARISON)},
159	{OT_list, (ST_ADD \| ST_CONCATENATION)},	159	{OT_list, "list", (ST_ADD \| ST_CONCATENATION)},
160	{OT_vector, (ST_MULTIPLY \| ST_ADD \| ST_SUBTRACT \| ST_EQUALITY \| ST_CONCATENATION \| ST_ASSIGNMENT \| ST_MODULO)},	160	{OT_vector, "vector", (ST_MULTIPLY \| ST_ADD \| ST_SUBTRACT \| ST_EQUALITY \| ST_CONCATENATION \| ST_ASSIGNMENT \| ST_MODULO)},
161	{OT_vector, (ST_MULTIPLY)},	161	{OT_vector, "vector", (ST_MULTIPLY)},
162	{OT_vector, (ST_MULTIPLY)},	162	{OT_vector, "vector", (ST_MULTIPLY)},
163	{OT_rotation, (ST_MULTIPLY \| ST_ADD \| ST_SUBTRACT \| ST_EQUALITY \| ST_CONCATENATION \| ST_ASSIGNMENT)},	163	{OT_rotation, "rotation", (ST_MULTIPLY \| ST_ADD \| ST_SUBTRACT \| ST_EQUALITY \| ST_CONCATENATION \| ST_ASSIGNMENT)},
164	{OT_other, (ST_NONE)},	164	{OT_other, "other", (ST_NONE)},
165	{OT_invalid, (ST_NONE)}	165	{OT_invalid, "invalid", (ST_NONE)}
166	};	166	};
167		167
168	opType opExpr[][10] =	168	opType opExpr[][10] =
@@ -277,14 +277,14 @@ LSL_Leaf addOperation(LSL_Leaf left, LSL_Leaf lval, LSL_Leaf right)
277	}	277	}
278	if (OT_invalid == lval->basicType)	278	if (OT_invalid == lval->basicType)
279	{	279	{
280	if ((left) && (right))	280	char leftType = "", rightType = "";
281	fprintf(stderr, "Invalid operation [%s %s %s] type at line %d column %d\n", left->token->token, lval->token->token, right->token->token, lval->line, lval->column);	281
282	else if (left)	282	if (left)
283	fprintf(stderr, "Invalid operation [%s %s] type at line %d column %d\n", left->token->token, lval->token->token, lval->line, lval->column);	283	leftType = allowed[left->basicType].name;
284	else if (left)	284	if (right)
285	fprintf(stderr, "Invalid operation [%s %s] type at line %d column %d\n", lval->token->token, right->token->token, lval->line, lval->column);	285	rightType = allowed[right->basicType].name;
286	else	286
287	fprintf(stderr, "Invalid operation [%s] type at line %d column %d\n", lval->token->token, lval->line, lval->column);	287	fprintf(stderr, "Invalid operation [%s %s %s] @ line %d column %d\n", leftType, lval->token->token, rightType, lval->line, lval->column);
288	}	288	}
289	}	289	}
290		290


diff --git a/LuaSL/src/LuaSL_LSL_tree.h b/LuaSL/src/LuaSL_LSL_tree.h index c33d77d..84610b6 100644 --- a/LuaSL/src/LuaSL_LSL_tree.h +++ b/LuaSL/src/LuaSL_LSL_tree.h
@@ -160,6 +160,7 @@ typedef enum
160	struct _allowedTypes	160	struct _allowedTypes
161	{	161	{
162	opType result;	162	opType result;
		163	char *name;
163	int subTypes;	164	int subTypes;
164	};	165	};
165		166