diff options
-rw-r--r-- | LuaSL/src/LSL.lua | 2 | ||||
-rw-r--r-- | LuaSL/src/LuaSL_LSL_tree.h | 17 | ||||
-rw-r--r-- | LuaSL/src/LuaSL_compile.c | 2 | ||||
-rw-r--r-- | LuaSL/src/LuaSL_utilities.c | 8 |
4 files changed, 3 insertions, 26 deletions
diff --git a/LuaSL/src/LSL.lua b/LuaSL/src/LSL.lua index c8c2c6d..1ec3fa1 100644 --- a/LuaSL/src/LSL.lua +++ b/LuaSL/src/LSL.lua | |||
@@ -227,7 +227,7 @@ LSL.x = 0.0; | |||
227 | LSL.y = 0.0; | 227 | LSL.y = 0.0; |
228 | LSL.z = 0.0; | 228 | LSL.z = 0.0; |
229 | 229 | ||
230 | -- ll*() functions. | 230 | -- ll*() function stubs. |
231 | 231 | ||
232 | function --[[float]] LSL.llPow(--[[float]] number,--[[float]] places) return 0.0 end; | 232 | function --[[float]] LSL.llPow(--[[float]] number,--[[float]] places) return 0.0 end; |
233 | function --[[float]] LSL.llFrand(--[[float]] max) return 0.0 end; | 233 | function --[[float]] LSL.llFrand(--[[float]] max) return 0.0 end; |
diff --git a/LuaSL/src/LuaSL_LSL_tree.h b/LuaSL/src/LuaSL_LSL_tree.h index f21b51c..435cf65 100644 --- a/LuaSL/src/LuaSL_LSL_tree.h +++ b/LuaSL/src/LuaSL_LSL_tree.h | |||
@@ -261,23 +261,6 @@ struct _LSL_Statement | |||
261 | Eina_Strbuf **ignorable; // Can be up to five of these I think. | 261 | Eina_Strbuf **ignorable; // Can be up to five of these I think. |
262 | #endif | 262 | #endif |
263 | miscFlags flags; | 263 | miscFlags flags; |
264 | /* | ||
265 | LSL_Leaf *addStatement(LSL_Leaf *lval, LSL_Type type, LSL_Leaf *left, LSL_Leaf *expr, LSL_Leaf *right, LSL_Leaf *block); | ||
266 | |||
267 | expr expr // Might be bogus, | ||
268 | Variable defines identifier, optional expr // For these we only store the variable leaf in expressions. | ||
269 | Function define identifier, block, parens // Also function params, but that's stored in the function anyway. | ||
270 | state change identifier | ||
271 | Labels identifier | ||
272 | goto identifier | ||
273 | return optional expr | ||
274 | do expr, block, parens | ||
275 | for exprx3, block, parens | ||
276 | if expr, block, parens | ||
277 | else block | ||
278 | else if expr, block, parens | ||
279 | while expr, block, parens | ||
280 | */ | ||
281 | }; | 264 | }; |
282 | 265 | ||
283 | struct _LSL_Block | 266 | struct _LSL_Block |
diff --git a/LuaSL/src/LuaSL_compile.c b/LuaSL/src/LuaSL_compile.c index b9ccf46..29ea47c 100644 --- a/LuaSL/src/LuaSL_compile.c +++ b/LuaSL/src/LuaSL_compile.c | |||
@@ -1897,7 +1897,7 @@ static void outputFunctionToken(FILE *file, outputMode mode, LSL_Leaf *content) | |||
1897 | } | 1897 | } |
1898 | EINA_INARRAY_FOREACH((&(func->vars)), param) | 1898 | EINA_INARRAY_FOREACH((&(func->vars)), param) |
1899 | { | 1899 | { |
1900 | // TODO - comment out param types. | 1900 | // Commenting out the types is done in outputLeaf() which outputs all the types. |
1901 | if (!LUASL_DIFF_CHECK) | 1901 | if (!LUASL_DIFF_CHECK) |
1902 | { | 1902 | { |
1903 | if (!first) | 1903 | if (!first) |
diff --git a/LuaSL/src/LuaSL_utilities.c b/LuaSL/src/LuaSL_utilities.c index 6a111a2..d73c06d 100644 --- a/LuaSL/src/LuaSL_utilities.c +++ b/LuaSL/src/LuaSL_utilities.c | |||
@@ -61,7 +61,7 @@ char *getDateTime(struct tm **nowOut, char *dateOut, time_t *timeOut) | |||
61 | if (timeOut) | 61 | if (timeOut) |
62 | *timeOut = szClock; | 62 | *timeOut = szClock; |
63 | 63 | ||
64 | // format | 64 | // format |
65 | strftime(date, DATE_TIME_LEN, "%d/%m/%Y %H:%M:%S\r", newTime); | 65 | strftime(date, DATE_TIME_LEN, "%d/%m/%Y %H:%M:%S\r", newTime); |
66 | return (dateTime); | 66 | return (dateTime); |
67 | } | 67 | } |
@@ -73,9 +73,6 @@ float timeDiff(struct timeval *now, struct timeval *then) | |||
73 | struct timeval thisTime = { 0, 0 }; | 73 | struct timeval thisTime = { 0, 0 }; |
74 | double result = 0.0; | 74 | double result = 0.0; |
75 | 75 | ||
76 | //fprintf(stderr, " %ld . %ld\n", now->tv_sec, now->tv_usec); | ||
77 | //fprintf(stderr, "minus %ld . %ld\n", then->tv_sec, then->tv_usec); | ||
78 | |||
79 | thisTime.tv_sec = now->tv_sec; | 76 | thisTime.tv_sec = now->tv_sec; |
80 | thisTime.tv_usec = now->tv_usec; | 77 | thisTime.tv_usec = now->tv_usec; |
81 | if (thisTime.tv_usec < then->tv_usec) | 78 | if (thisTime.tv_usec < then->tv_usec) |
@@ -87,11 +84,8 @@ float timeDiff(struct timeval *now, struct timeval *then) | |||
87 | thisTime.tv_sec -= then->tv_sec; | 84 | thisTime.tv_sec -= then->tv_sec; |
88 | result = ((double) thisTime.tv_usec) / ((double) 1000000.0); | 85 | result = ((double) thisTime.tv_usec) / ((double) 1000000.0); |
89 | result += thisTime.tv_sec; | 86 | result += thisTime.tv_sec; |
90 | //fprintf(stderr, "equals %lf\n", result); | ||
91 | //fflush(stderr); | ||
92 | return result; | 87 | return result; |
93 | } | 88 | } |
94 | else | 89 | else |
95 | return 0.0; | 90 | return 0.0; |
96 | } | 91 | } |
97 | |||