annotate lwlib/lw_expr.c @ 448:5cccf90bf838 3.0 tip

Fixed bug with complex external references generating invalid relocations in the object file
author lost@l-w.ca
date Fri, 05 Nov 2010 22:27:00 -0600
parents a8934dfba400
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
1 /*
f2173d18c73f Checkpoint
lost
parents:
diff changeset
2 lwexpr.c
f2173d18c73f Checkpoint
lost
parents:
diff changeset
3
f2173d18c73f Checkpoint
lost
parents:
diff changeset
4 Copyright © 2010 William Astle
f2173d18c73f Checkpoint
lost
parents:
diff changeset
5
f2173d18c73f Checkpoint
lost
parents:
diff changeset
6 This file is part of LWTOOLS.
f2173d18c73f Checkpoint
lost
parents:
diff changeset
7
f2173d18c73f Checkpoint
lost
parents:
diff changeset
8 LWTOOLS is free software: you can redistribute it and/or modify it under the
f2173d18c73f Checkpoint
lost
parents:
diff changeset
9 terms of the GNU General Public License as published by the Free Software
f2173d18c73f Checkpoint
lost
parents:
diff changeset
10 Foundation, either version 3 of the License, or (at your option) any later
f2173d18c73f Checkpoint
lost
parents:
diff changeset
11 version.
f2173d18c73f Checkpoint
lost
parents:
diff changeset
12
f2173d18c73f Checkpoint
lost
parents:
diff changeset
13 This program is distributed in the hope that it will be useful, but WITHOUT
f2173d18c73f Checkpoint
lost
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
f2173d18c73f Checkpoint
lost
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
f2173d18c73f Checkpoint
lost
parents:
diff changeset
16 more details.
f2173d18c73f Checkpoint
lost
parents:
diff changeset
17
f2173d18c73f Checkpoint
lost
parents:
diff changeset
18 You should have received a copy of the GNU General Public License along with
f2173d18c73f Checkpoint
lost
parents:
diff changeset
19 this program. If not, see <http://www.gnu.org/licenses/>.
f2173d18c73f Checkpoint
lost
parents:
diff changeset
20 */
f2173d18c73f Checkpoint
lost
parents:
diff changeset
21
f2173d18c73f Checkpoint
lost
parents:
diff changeset
22 #include <config.h>
f2173d18c73f Checkpoint
lost
parents:
diff changeset
23
f2173d18c73f Checkpoint
lost
parents:
diff changeset
24 #include <stdarg.h>
f2173d18c73f Checkpoint
lost
parents:
diff changeset
25 #include <stdio.h>
f2173d18c73f Checkpoint
lost
parents:
diff changeset
26 #include <string.h>
f2173d18c73f Checkpoint
lost
parents:
diff changeset
27
f2173d18c73f Checkpoint
lost
parents:
diff changeset
28 #define ___lw_expr_c_seen___
f2173d18c73f Checkpoint
lost
parents:
diff changeset
29 #include "lw_alloc.h"
f2173d18c73f Checkpoint
lost
parents:
diff changeset
30 #include "lw_expr.h"
f2173d18c73f Checkpoint
lost
parents:
diff changeset
31 #include "lw_error.h"
f2173d18c73f Checkpoint
lost
parents:
diff changeset
32 #include "lw_string.h"
f2173d18c73f Checkpoint
lost
parents:
diff changeset
33
342
7b4123dce741 Added basic symbol registration
lost@starbug
parents: 337
diff changeset
34 static lw_expr_fn_t *evaluate_special = NULL;
7b4123dce741 Added basic symbol registration
lost@starbug
parents: 337
diff changeset
35 static lw_expr_fn2_t *evaluate_var = NULL;
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
36 static lw_expr_fn3_t *parse_term = NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
37
431
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
38 /* Q&D to break out of infinite recursion */
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
39 static int level = 0;
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
40 static int bailing = 0;
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
41
347
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
42 int lw_expr_istype(lw_expr_t e, int t)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
43 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
44 if (e -> type == t)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
45 return 1;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
46 return 0;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
47 }
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
48
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
49 int lw_expr_intval(lw_expr_t e)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
50 {
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
51 if (e -> type == lw_expr_type_int)
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
52 return e -> value;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
53 return -1;
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
54 }
1649bc7bda5a Some data oriented pseudo ops added
lost@starbug
parents: 346
diff changeset
55
387
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
56 int lw_expr_whichop(lw_expr_t e)
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
57 {
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
58 if (e -> type == lw_expr_type_oper)
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
59 return e -> value;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
60 return -1;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
61 }
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
62
367
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
63 int lw_expr_specint(lw_expr_t e)
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
64 {
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
65 if (e -> type == lw_expr_type_special)
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
66 return e -> value;
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
67 return -1;
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
68 }
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
69
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
70 void lw_expr_set_term_parser(lw_expr_fn3_t *fn)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
71 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
72 parse_term = fn;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
73 }
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
74
342
7b4123dce741 Added basic symbol registration
lost@starbug
parents: 337
diff changeset
75 void lw_expr_set_special_handler(lw_expr_fn_t *fn)
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
76 {
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
77 evaluate_special = fn;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
78 }
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
79
342
7b4123dce741 Added basic symbol registration
lost@starbug
parents: 337
diff changeset
80 void lw_expr_set_var_handler(lw_expr_fn2_t *fn)
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
81 {
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
82 evaluate_var = fn;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
83 }
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
84
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
85 lw_expr_t lw_expr_create(void)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
86 {
f2173d18c73f Checkpoint
lost
parents:
diff changeset
87 lw_expr_t r;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
88
f2173d18c73f Checkpoint
lost
parents:
diff changeset
89 r = lw_alloc(sizeof(struct lw_expr_priv));
f2173d18c73f Checkpoint
lost
parents:
diff changeset
90 r -> operands = NULL;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
91
f2173d18c73f Checkpoint
lost
parents:
diff changeset
92 return r;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
93 }
f2173d18c73f Checkpoint
lost
parents:
diff changeset
94
f2173d18c73f Checkpoint
lost
parents:
diff changeset
95 void lw_expr_destroy(lw_expr_t E)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
96 {
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
97 struct lw_expr_opers *o;
426
652eee8f0c82 Fixed lw_expr_destroy() to not crash on NULL
lost@l-w.ca
parents: 387
diff changeset
98 if (!E)
652eee8f0c82 Fixed lw_expr_destroy() to not crash on NULL
lost@l-w.ca
parents: 387
diff changeset
99 return;
438
22bbb716dea6 Fixed memory leaks related to expressions; bumped version to 3.0.1
lost@l-w.ca
parents: 431
diff changeset
100 while (E -> operands)
22bbb716dea6 Fixed memory leaks related to expressions; bumped version to 3.0.1
lost@l-w.ca
parents: 431
diff changeset
101 {
22bbb716dea6 Fixed memory leaks related to expressions; bumped version to 3.0.1
lost@l-w.ca
parents: 431
diff changeset
102 o = E -> operands;
22bbb716dea6 Fixed memory leaks related to expressions; bumped version to 3.0.1
lost@l-w.ca
parents: 431
diff changeset
103 E -> operands = o -> next;
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
104 lw_expr_destroy(o -> p);
440
367bdde181be Fixed type in fix
lost@l-w.ca
parents: 438
diff changeset
105 lw_free(o);
438
22bbb716dea6 Fixed memory leaks related to expressions; bumped version to 3.0.1
lost@l-w.ca
parents: 431
diff changeset
106 }
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
107 if (E -> type == lw_expr_type_var)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
108 lw_free(E -> value2);
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
109 lw_free(E);
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
110 }
f2173d18c73f Checkpoint
lost
parents:
diff changeset
111
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
112 /* actually duplicates the entire expression */
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
113 void lw_expr_add_operand(lw_expr_t E, lw_expr_t O);
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
114 lw_expr_t lw_expr_copy(lw_expr_t E)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
115 {
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
116 lw_expr_t r, t;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
117 struct lw_expr_opers *o;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
118
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
119 r = lw_alloc(sizeof(struct lw_expr_priv));
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
120 *r = *E;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
121 r -> operands = NULL;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
122
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
123 if (E -> type == lw_expr_type_var)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
124 r -> value2 = lw_strdup(E -> value2);
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
125 for (o = E -> operands; o; o = o -> next)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
126 {
438
22bbb716dea6 Fixed memory leaks related to expressions; bumped version to 3.0.1
lost@l-w.ca
parents: 431
diff changeset
127 lw_expr_add_operand(r, o -> p);
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
128 }
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
129
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
130 return r;
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
131 }
f2173d18c73f Checkpoint
lost
parents:
diff changeset
132
f2173d18c73f Checkpoint
lost
parents:
diff changeset
133 void lw_expr_add_operand(lw_expr_t E, lw_expr_t O)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
134 {
f2173d18c73f Checkpoint
lost
parents:
diff changeset
135 struct lw_expr_opers *o, *t;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
136
f2173d18c73f Checkpoint
lost
parents:
diff changeset
137 o = lw_alloc(sizeof(struct lw_expr_opers));
f2173d18c73f Checkpoint
lost
parents:
diff changeset
138 o -> p = lw_expr_copy(O);
f2173d18c73f Checkpoint
lost
parents:
diff changeset
139 o -> next = NULL;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
140 for (t = E -> operands; t && t -> next; t = t -> next)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
141 /* do nothing */ ;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
142
f2173d18c73f Checkpoint
lost
parents:
diff changeset
143 if (t)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
144 t -> next = o;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
145 else
f2173d18c73f Checkpoint
lost
parents:
diff changeset
146 E -> operands = o;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
147 }
f2173d18c73f Checkpoint
lost
parents:
diff changeset
148
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
149 lw_expr_t lw_expr_build_aux(int exprtype, va_list args)
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
150 {
f2173d18c73f Checkpoint
lost
parents:
diff changeset
151 lw_expr_t r;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
152 int t;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
153 void *p;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
154
f2173d18c73f Checkpoint
lost
parents:
diff changeset
155 lw_expr_t te1, te2;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
156
f2173d18c73f Checkpoint
lost
parents:
diff changeset
157 r = lw_expr_create();
f2173d18c73f Checkpoint
lost
parents:
diff changeset
158
f2173d18c73f Checkpoint
lost
parents:
diff changeset
159 switch (exprtype)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
160 {
f2173d18c73f Checkpoint
lost
parents:
diff changeset
161 case lw_expr_type_int:
f2173d18c73f Checkpoint
lost
parents:
diff changeset
162 t = va_arg(args, int);
f2173d18c73f Checkpoint
lost
parents:
diff changeset
163 r -> type = lw_expr_type_int;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
164 r -> value = t;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
165 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
166
f2173d18c73f Checkpoint
lost
parents:
diff changeset
167 case lw_expr_type_var:
f2173d18c73f Checkpoint
lost
parents:
diff changeset
168 p = va_arg(args, char *);
f2173d18c73f Checkpoint
lost
parents:
diff changeset
169 r -> type = lw_expr_type_var;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
170 r -> value2 = lw_strdup(p);
f2173d18c73f Checkpoint
lost
parents:
diff changeset
171 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
172
f2173d18c73f Checkpoint
lost
parents:
diff changeset
173 case lw_expr_type_special:
f2173d18c73f Checkpoint
lost
parents:
diff changeset
174 t = va_arg(args, int);
f2173d18c73f Checkpoint
lost
parents:
diff changeset
175 p = va_arg(args, char *);
f2173d18c73f Checkpoint
lost
parents:
diff changeset
176 r -> type = lw_expr_type_special;
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
177 r -> value = t;
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
178 r -> value2 = p;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
179 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
180
f2173d18c73f Checkpoint
lost
parents:
diff changeset
181 case lw_expr_type_oper:
f2173d18c73f Checkpoint
lost
parents:
diff changeset
182 t = va_arg(args, int);
f2173d18c73f Checkpoint
lost
parents:
diff changeset
183 te1 = va_arg(args, lw_expr_t);
f2173d18c73f Checkpoint
lost
parents:
diff changeset
184 if (t != lw_expr_oper_com && t != lw_expr_oper_neg)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
185 te2 = va_arg(args, lw_expr_t);
f2173d18c73f Checkpoint
lost
parents:
diff changeset
186 else
f2173d18c73f Checkpoint
lost
parents:
diff changeset
187 te2 = NULL;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
188
f2173d18c73f Checkpoint
lost
parents:
diff changeset
189 r -> type = lw_expr_type_oper;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
190 r -> value = t;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
191 lw_expr_add_operand(r, te1);
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
192 if (te2)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
193 lw_expr_add_operand(r, te2);
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
194 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
195
f2173d18c73f Checkpoint
lost
parents:
diff changeset
196 default:
f2173d18c73f Checkpoint
lost
parents:
diff changeset
197 lw_error("Invalid expression type specified to lw_expr_build");
f2173d18c73f Checkpoint
lost
parents:
diff changeset
198 }
f2173d18c73f Checkpoint
lost
parents:
diff changeset
199
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
200 return r;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
201 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
202
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
203 lw_expr_t lw_expr_build(int exprtype, ...)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
204 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
205 va_list args;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
206 lw_expr_t r;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
207
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
208 va_start(args, exprtype);
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
209 r = lw_expr_build_aux(exprtype, args);
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
210 va_end(args);
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
211 return r;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
212 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
213
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
214 void lw_expr_print_aux(lw_expr_t E, char **obuf, int *buflen, int *bufloc)
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
215 {
f2173d18c73f Checkpoint
lost
parents:
diff changeset
216 struct lw_expr_opers *o;
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
217 int c = 0;
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
218 char buf[256];
387
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
219
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
220 if (!E)
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
221 {
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
222 strcpy(buf, "(NULL)");
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
223 return;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
224 }
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
225 for (o = E -> operands; o; o = o -> next)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
226 {
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
227 c++;
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
228 lw_expr_print_aux(o -> p, obuf, buflen, bufloc);
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
229 }
f2173d18c73f Checkpoint
lost
parents:
diff changeset
230
f2173d18c73f Checkpoint
lost
parents:
diff changeset
231 switch (E -> type)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
232 {
f2173d18c73f Checkpoint
lost
parents:
diff changeset
233 case lw_expr_type_int:
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
234 if (E -> value < 0)
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
235 snprintf(buf, 256, "-%#x ", -(E -> value));
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
236 else
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
237 snprintf(buf, 256, "%#x ", E -> value);
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
238 break;
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
239
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
240 case lw_expr_type_var:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
241 snprintf(buf, 256, "V(%s) ", (char *)(E -> value2));
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
242 break;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
243
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
244 case lw_expr_type_special:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
245 snprintf(buf, 256, "S(%d,%p) ", E -> value, E -> value2);
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
246 break;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
247
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
248 case lw_expr_type_oper:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
249 snprintf(buf, 256, "[%d]", c);
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
250 switch (E -> value)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
251 {
f2173d18c73f Checkpoint
lost
parents:
diff changeset
252 case lw_expr_oper_plus:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
253 strcat(buf, "+ ");
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
254 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
255
f2173d18c73f Checkpoint
lost
parents:
diff changeset
256 case lw_expr_oper_minus:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
257 strcat(buf, "- ");
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
258 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
259
f2173d18c73f Checkpoint
lost
parents:
diff changeset
260 case lw_expr_oper_times:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
261 strcat(buf, "* ");
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
262 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
263
f2173d18c73f Checkpoint
lost
parents:
diff changeset
264 case lw_expr_oper_divide:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
265 strcat(buf, "/ ");
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
266 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
267
f2173d18c73f Checkpoint
lost
parents:
diff changeset
268 case lw_expr_oper_mod:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
269 strcat(buf, "% ");
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
270 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
271
f2173d18c73f Checkpoint
lost
parents:
diff changeset
272 case lw_expr_oper_intdiv:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
273 strcat(buf, "\\ ");
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
274 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
275
f2173d18c73f Checkpoint
lost
parents:
diff changeset
276 case lw_expr_oper_bwand:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
277 strcat(buf, "BWAND ");
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
278 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
279
f2173d18c73f Checkpoint
lost
parents:
diff changeset
280 case lw_expr_oper_bwor:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
281 strcat(buf, "BWOR ");
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
282 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
283
f2173d18c73f Checkpoint
lost
parents:
diff changeset
284 case lw_expr_oper_bwxor:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
285 strcat(buf, "BWXOR ");
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
286 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
287
f2173d18c73f Checkpoint
lost
parents:
diff changeset
288 case lw_expr_oper_and:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
289 strcat(buf, "AND ");
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
290 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
291
f2173d18c73f Checkpoint
lost
parents:
diff changeset
292 case lw_expr_oper_or:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
293 strcat(buf, "OR ");
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
294 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
295
f2173d18c73f Checkpoint
lost
parents:
diff changeset
296 case lw_expr_oper_neg:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
297 strcat(buf, "NEG ");
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
298 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
299
f2173d18c73f Checkpoint
lost
parents:
diff changeset
300 case lw_expr_oper_com:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
301 strcat(buf, "COM ");
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
302 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
303
f2173d18c73f Checkpoint
lost
parents:
diff changeset
304 default:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
305 strcat(buf, "OPER ");
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
306 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
307 }
f2173d18c73f Checkpoint
lost
parents:
diff changeset
308 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
309 default:
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
310 snprintf(buf, 256, "ERR ");
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
311 break;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
312 }
372
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
313
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
314 c = strlen(buf);
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
315 if (*bufloc + c >= *buflen)
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
316 {
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
317 *buflen += 128;
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
318 *obuf = lw_realloc(*obuf, *buflen);
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
319 }
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
320 strcpy(*obuf + *bufloc, buf);
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
321 *bufloc += c;
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
322 }
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
323
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
324 char *lw_expr_print(lw_expr_t E)
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
325 {
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
326 static char *obuf = NULL;
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
327 static int obufsize = 0;
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
328
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
329 int obufloc = 0;
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
330
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
331 lw_expr_print_aux(E, &obuf, &obufsize, &obufloc);
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
332
90de73ba0cac Created a useful debug framework and adjusted lw_expr_print() to return a "static" dynamic string
lost@starbug
parents: 371
diff changeset
333 return obuf;
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
334 }
f2173d18c73f Checkpoint
lost
parents:
diff changeset
335
f2173d18c73f Checkpoint
lost
parents:
diff changeset
336 /*
f2173d18c73f Checkpoint
lost
parents:
diff changeset
337 Return:
f2173d18c73f Checkpoint
lost
parents:
diff changeset
338 nonzero if expressions are the same (identical pointers or matching values)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
339 zero if expressions are not the same
f2173d18c73f Checkpoint
lost
parents:
diff changeset
340
f2173d18c73f Checkpoint
lost
parents:
diff changeset
341 */
f2173d18c73f Checkpoint
lost
parents:
diff changeset
342 int lw_expr_compare(lw_expr_t E1, lw_expr_t E2)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
343 {
f2173d18c73f Checkpoint
lost
parents:
diff changeset
344 struct lw_expr_opers *o1, *o2;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
345
f2173d18c73f Checkpoint
lost
parents:
diff changeset
346 if (E1 == E2)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
347 return 1;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
348
431
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
349 if (!E1 || !E2)
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
350 return 0;
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
351
334
f2173d18c73f Checkpoint
lost
parents:
diff changeset
352 if (!(E1 -> type == E2 -> type && E1 -> value == E2 -> value))
f2173d18c73f Checkpoint
lost
parents:
diff changeset
353 return 0;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
354
f2173d18c73f Checkpoint
lost
parents:
diff changeset
355 if (E1 -> type == lw_expr_type_var)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
356 {
f2173d18c73f Checkpoint
lost
parents:
diff changeset
357 if (!strcmp(E1 -> value2, E2 -> value2))
f2173d18c73f Checkpoint
lost
parents:
diff changeset
358 return 1;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
359 else
f2173d18c73f Checkpoint
lost
parents:
diff changeset
360 return 0;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
361 }
f2173d18c73f Checkpoint
lost
parents:
diff changeset
362
f2173d18c73f Checkpoint
lost
parents:
diff changeset
363 if (E1 -> type == lw_expr_type_special)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
364 {
f2173d18c73f Checkpoint
lost
parents:
diff changeset
365 if (E1 -> value2 == E2 -> value2)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
366 return 1;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
367 else
f2173d18c73f Checkpoint
lost
parents:
diff changeset
368 return 0;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
369 }
f2173d18c73f Checkpoint
lost
parents:
diff changeset
370
f2173d18c73f Checkpoint
lost
parents:
diff changeset
371 for (o1 = E1 -> operands, o2 = E2 -> operands; o1 && o2; o1 = o1 -> next, o2 = o2 -> next)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
372 if (lw_expr_compare(o1 -> p, o2 -> p) == 0)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
373 return 0;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
374 if (o1 || o2)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
375 return 0;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
376
f2173d18c73f Checkpoint
lost
parents:
diff changeset
377 return 1;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
378 }
f2173d18c73f Checkpoint
lost
parents:
diff changeset
379
f2173d18c73f Checkpoint
lost
parents:
diff changeset
380 /* return true if E is an operator of type oper */
f2173d18c73f Checkpoint
lost
parents:
diff changeset
381 int lw_expr_isoper(lw_expr_t E, int oper)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
382 {
f2173d18c73f Checkpoint
lost
parents:
diff changeset
383 if (E -> type == lw_expr_type_oper && E -> value == oper)
f2173d18c73f Checkpoint
lost
parents:
diff changeset
384 return 1;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
385 return 0;
f2173d18c73f Checkpoint
lost
parents:
diff changeset
386 }
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
387
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
388
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
389 void lw_expr_simplify_sortconstfirst(lw_expr_t E)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
390 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
391 struct lw_expr_opers *o;
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
392
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
393 if (E -> type != lw_expr_type_oper)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
394 return;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
395 if (E -> value != lw_expr_oper_times && E -> value != lw_expr_oper_plus)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
396 return;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
397
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
398 for (o = E -> operands; o; o = o -> next)
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
399 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
400 if (o -> p -> type == lw_expr_type_oper && (o -> p -> value == lw_expr_oper_times || o -> p -> value == lw_expr_oper_plus))
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
401 lw_expr_simplify_sortconstfirst(o -> p);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
402 }
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
403
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
404 for (o = E -> operands; o; o = o -> next)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
405 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
406 if (o -> p -> type == lw_expr_type_int && o != E -> operands)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
407 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
408 struct lw_expr_opers *o2;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
409 for (o2 = E -> operands; o2 -> next != o; o2 = o2 -> next)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
410 /* do nothing */ ;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
411 o2 -> next = o -> next;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
412 o -> next = E -> operands;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
413 E -> operands = o;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
414 o = o2;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
415 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
416 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
417 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
418
336
401587ab6a09 checkpoint
lost
parents: 335
diff changeset
419 void lw_expr_sortoperandlist(struct lw_expr_opers **o)
401587ab6a09 checkpoint
lost
parents: 335
diff changeset
420 {
382
eacdae8a1575 Various bugfixes
lost@starbug
parents: 376
diff changeset
421 // fprintf(stderr, "lw_expr_sortoperandlist() not yet implemented\n");
336
401587ab6a09 checkpoint
lost
parents: 335
diff changeset
422 }
401587ab6a09 checkpoint
lost
parents: 335
diff changeset
423
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
424 // return 1 if the operand lists match, 0 if not
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
425 // may re-order the argument lists
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
426 int lw_expr_simplify_compareoperandlist(struct lw_expr_opers **ol1, struct lw_expr_opers **ol2)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
427 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
428 struct lw_expr_opers *o1, *o2;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
429
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
430 lw_expr_sortoperandlist(ol1);
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
431 lw_expr_sortoperandlist(ol2);
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
432
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
433 for (o1 = *ol1, o2 = *ol2; o1 && o2; o1 = o1 -> next, o2 = o2 -> next)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
434 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
435 if (!lw_expr_compare(o1 -> p, o2 -> p))
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
436 return 0;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
437 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
438 if (o1 || o2)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
439 return 0;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
440 return 1;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
441 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
442
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
443 int lw_expr_simplify_isliketerm(lw_expr_t e1, lw_expr_t e2)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
444 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
445 // first term is a "times"
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
446 if (e1 -> type == lw_expr_type_oper && e1 -> value == lw_expr_oper_times)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
447 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
448 // second term is a "times"
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
449 if (e2 -> type == lw_expr_type_oper && e2 -> value == lw_expr_oper_times)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
450 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
451 // both times - easy check
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
452 struct lw_expr_opers *o1, *o2;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
453 for (o1 = e1 -> operands; o1; o1 = o1 -> next)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
454 if (o1 -> p -> type != lw_expr_type_int)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
455 break;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
456
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
457 for (o2 = e2 -> operands; o2; o2 = o2 -> next)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
458 if (o2 -> p -> type != lw_expr_type_int)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
459 break;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
460
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
461 if (lw_expr_simplify_compareoperandlist(&o1, &o2))
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
462 return 1;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
463 return 0;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
464 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
465
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
466 // not a times - have to assume it's the operand list
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
467 // with a "1 *" in front if it
431
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
468 if (!e1 -> operands -> next)
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
469 return 0;
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
470 if (e1 -> operands -> next -> next)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
471 return 0;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
472 if (!lw_expr_compare(e1 -> operands -> next -> p, e2))
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
473 return 0;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
474 return 1;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
475 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
476
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
477 // e1 is not a times
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
478 if (e2 -> type == lw_expr_type_oper && e2 -> value == lw_expr_oper_times)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
479 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
480 // e2 is a times
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
481 if (e2 -> operands -> next -> next)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
482 return 0;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
483 if (!lw_expr_compare(e1, e2 -> operands -> next -> p))
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
484 return 0;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
485 return 1;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
486 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
487
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
488 // neither are times
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
489 if (!lw_expr_compare(e1, e2))
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
490 return 0;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
491 return 1;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
492 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
493
431
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
494 int lw_expr_contains(lw_expr_t E, lw_expr_t E1)
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
495 {
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
496 struct lw_expr_opers *o;
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
497
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
498 // NULL expr contains nothing :)
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
499 if (!E)
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
500 return 0;
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
501
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
502 if (E1 -> type != lw_expr_type_var && E1 -> type != lw_expr_type_special)
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
503 return 0;
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
504
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
505 if (lw_expr_compare(E, E1))
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
506 return 1;
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
507
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
508 for (o = E -> operands; o; o = o -> next)
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
509 {
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
510 if (lw_expr_contains(o -> p, E1))
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
511 return 1;
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
512 }
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
513 return 0;
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
514 }
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
515
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
516 void lw_expr_simplify_l(lw_expr_t E, void *priv);
387
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
517
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
518 void lw_expr_simplify_go(lw_expr_t E, void *priv)
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
519 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
520 struct lw_expr_opers *o;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
521
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
522 // replace subtraction with O1 + -1(O2)...
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
523 // needed for like term collection
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
524 if (E -> type == lw_expr_type_oper && E -> value == lw_expr_oper_minus)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
525 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
526 for (o = E -> operands -> next; o; o = o -> next)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
527 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
528 lw_expr_t e1, e2;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
529
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
530 e2 = lw_expr_build(lw_expr_type_int, -1);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
531 e1 = lw_expr_build(lw_expr_type_oper, lw_expr_oper_times, e2, o -> p);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
532 lw_expr_destroy(o -> p);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
533 lw_expr_destroy(e2);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
534 o -> p = e1;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
535 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
536 E -> value = lw_expr_oper_plus;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
537 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
538
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
539 // turn "NEG" into -1(O) - needed for like term collection
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
540 if (E -> type == lw_expr_type_oper && E -> value == lw_expr_oper_neg)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
541 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
542 lw_expr_t e1;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
543
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
544 E -> value = lw_expr_oper_times;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
545 e1 = lw_expr_build(lw_expr_type_int, -1);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
546 lw_expr_add_operand(E, e1);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
547 lw_expr_destroy(e1);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
548 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
549
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
550 again:
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
551 // try to resolve non-constant terms to constants here
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
552 if (E -> type == lw_expr_type_special && evaluate_special)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
553 {
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
554 lw_expr_t te;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
555
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
556 te = evaluate_special(E -> value, E -> value2, priv);
431
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
557 if (lw_expr_contains(te, E))
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
558 lw_expr_destroy(te);
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
559 if (te)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
560 {
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
561 for (o = E -> operands; o; o = o -> next)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
562 lw_expr_destroy(o -> p);
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
563 if (E -> type == lw_expr_type_var)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
564 lw_free(E -> value2);
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
565 *E = *te;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
566 E -> operands = NULL;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
567
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
568 if (te -> type == lw_expr_type_var)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
569 E -> value2 = lw_strdup(te -> value2);
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
570 for (o = te -> operands; o; o = o -> next)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
571 {
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
572 lw_expr_add_operand(E, lw_expr_copy(o -> p));
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
573 }
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
574 lw_expr_destroy(te);
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
575 goto again;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
576 }
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
577 return;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
578 }
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
579
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
580 if (E -> type == lw_expr_type_var && evaluate_var)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
581 {
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
582 lw_expr_t te;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
583
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
584 te = evaluate_var(E -> value2, priv);
431
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
585 if (lw_expr_contains(te, E))
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
586 lw_expr_destroy(te);
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
587 else if (te)
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
588 {
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
589 for (o = E -> operands; o; o = o -> next)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
590 lw_expr_destroy(o -> p);
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
591 if (E -> type == lw_expr_type_var)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
592 lw_free(E -> value2);
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
593 *E = *te;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
594 E -> operands = NULL;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
595
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
596 if (te -> type == lw_expr_type_var)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
597 E -> value2 = lw_strdup(te -> value2);
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
598 for (o = te -> operands; o; o = o -> next)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
599 {
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
600 lw_expr_add_operand(E, lw_expr_copy(o -> p));
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
601 }
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
602 lw_expr_destroy(te);
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
603 goto again;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
604 }
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
605 return;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
606 }
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
607
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
608 // non-operators have no simplification to do!
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
609 if (E -> type != lw_expr_type_oper)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
610 return;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
611
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
612 // merge plus operations
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
613 if (E -> value == lw_expr_oper_plus)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
614 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
615 lw_expr_t e2;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
616
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
617 tryagainplus:
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
618 for (o = E -> operands; o; o = o -> next)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
619 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
620 if (o -> p -> type == lw_expr_type_oper && o -> p -> value == lw_expr_oper_plus)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
621 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
622 struct lw_expr_opers *o2, *o3;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
623 // we have a + operation - bring operands up
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
624
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
625 for (o2 = E -> operands; o2 && o2 -> next != o; o2 = o2 -> next)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
626 /* do nothing */ ;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
627 if (o2)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
628 o2 -> next = o -> p -> operands;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
629 else
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
630 E -> operands = o -> p -> operands;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
631 for (o2 = o -> p -> operands; o2 -> next; o2 = o2 -> next)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
632 /* do nothing */ ;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
633 o2 -> next = o -> next;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
634 o -> p -> operands = NULL;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
635 lw_expr_destroy(o -> p);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
636 lw_free(o);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
637 goto tryagainplus;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
638 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
639 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
640 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
641
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
642 // merge times operations
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
643 if (E -> value == lw_expr_oper_times)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
644 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
645 lw_expr_t e2;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
646
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
647 tryagaintimes:
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
648 for (o = E -> operands; o; o = o -> next)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
649 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
650 if (o -> p -> type == lw_expr_type_oper && o -> p -> value == lw_expr_oper_times)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
651 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
652 struct lw_expr_opers *o2, *o3;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
653 // we have a + operation - bring operands up
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
654
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
655 for (o2 = E -> operands; o2 && o2 -> next != o; o2 = o2 -> next)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
656 /* do nothing */ ;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
657 if (o2)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
658 o2 -> next = o -> p -> operands;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
659 else
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
660 E -> operands = o -> p -> operands;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
661 for (o2 = o -> p -> operands; o2 -> next; o2 = o2 -> next)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
662 /* do nothing */ ;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
663 o2 -> next = o -> next;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
664 o -> p -> operands = NULL;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
665 lw_expr_destroy(o -> p);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
666 lw_free(o);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
667 goto tryagaintimes;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
668 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
669 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
670 }
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
671
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
672 // simplify operands
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
673 for (o = E -> operands; o; o = o -> next)
431
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
674 lw_expr_simplify_l(o -> p, priv);
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
675
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
676 for (o = E -> operands; o; o = o -> next)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
677 {
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
678 if (o -> p -> type != lw_expr_type_int)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
679 break;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
680 }
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
681
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
682 if (!o)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
683 {
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
684 // we can do the operation here!
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
685 int tr = -42424242;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
686
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
687 switch (E -> value)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
688 {
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
689 case lw_expr_oper_neg:
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
690 tr = -(E -> operands -> p -> value);
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
691 break;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
692
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
693 case lw_expr_oper_com:
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
694 tr = ~(E -> operands -> p -> value);
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
695 break;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
696
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
697 case lw_expr_oper_plus:
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
698 tr = E -> operands -> p -> value;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
699 for (o = E -> operands -> next; o; o = o -> next)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
700 tr += o -> p -> value;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
701 break;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
702
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
703 case lw_expr_oper_minus:
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
704 tr = E -> operands -> p -> value;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
705 for (o = E -> operands -> next; o; o = o -> next)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
706 tr -= o -> p -> value;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
707 break;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
708
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
709 case lw_expr_oper_times:
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
710 tr = E -> operands -> p -> value;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
711 for (o = E -> operands -> next; o; o = o -> next)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
712 tr *= o -> p -> value;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
713 break;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
714
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
715 case lw_expr_oper_divide:
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
716 tr = E -> operands -> p -> value / E -> operands -> next -> p -> value;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
717 break;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
718
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
719 case lw_expr_oper_mod:
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
720 tr = E -> operands -> p -> value % E -> operands -> next -> p -> value;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
721 break;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
722
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
723 case lw_expr_oper_intdiv:
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
724 tr = E -> operands -> p -> value / E -> operands -> next -> p -> value;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
725 break;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
726
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
727 case lw_expr_oper_bwand:
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
728 tr = E -> operands -> p -> value & E -> operands -> next -> p -> value;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
729 break;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
730
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
731 case lw_expr_oper_bwor:
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
732 tr = E -> operands -> p -> value | E -> operands -> next -> p -> value;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
733 break;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
734
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
735 case lw_expr_oper_bwxor:
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
736 tr = E -> operands -> p -> value ^ E -> operands -> next -> p -> value;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
737 break;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
738
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
739 case lw_expr_oper_and:
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
740 tr = E -> operands -> p -> value && E -> operands -> next -> p -> value;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
741 break;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
742
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
743 case lw_expr_oper_or:
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
744 tr = E -> operands -> p -> value || E -> operands -> next -> p -> value;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
745 break;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
746
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
747 }
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
748
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
749 while (E -> operands)
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
750 {
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
751 o = E -> operands;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
752 E -> operands = o -> next;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
753 lw_expr_destroy(o -> p);
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
754 lw_free(o);
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
755 }
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
756 E -> type = lw_expr_type_int;
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
757 E -> value = tr;
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
758 return;
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
759 }
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
760
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
761 if (E -> value == lw_expr_oper_plus)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
762 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
763 lw_expr_t e1;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
764 int cval = 0;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
765
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
766 e1 = lw_expr_create();
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
767 e1 -> operands = E -> operands;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
768 E -> operands = 0;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
769
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
770 for (o = e1 -> operands; o; o = o -> next)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
771 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
772 if (o -> p -> type == lw_expr_type_int)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
773 cval += o -> p -> value;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
774 else
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
775 lw_expr_add_operand(E, o -> p);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
776 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
777 lw_expr_destroy(e1);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
778 if (cval)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
779 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
780 e1 = lw_expr_build(lw_expr_type_int, cval);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
781 lw_expr_add_operand(E, e1);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
782 lw_expr_destroy(e1);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
783 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
784 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
785
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
786 if (E -> value == lw_expr_oper_times)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
787 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
788 lw_expr_t e1;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
789 int cval = 1;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
790
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
791 e1 = lw_expr_create();
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
792 e1 -> operands = E -> operands;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
793 E -> operands = 0;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
794
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
795 for (o = e1 -> operands; o; o = o -> next)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
796 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
797 if (o -> p -> type == lw_expr_type_int)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
798 cval *= o -> p -> value;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
799 else
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
800 lw_expr_add_operand(E, o -> p);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
801 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
802 lw_expr_destroy(e1);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
803 if (cval != 1)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
804 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
805 e1 = lw_expr_build(lw_expr_type_int, cval);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
806 lw_expr_add_operand(E, e1);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
807 lw_expr_destroy(e1);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
808 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
809 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
810
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
811 if (E -> value == lw_expr_oper_times)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
812 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
813 for (o = E -> operands; o; o = o -> next)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
814 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
815 if (o -> p -> type == lw_expr_type_int && o -> p -> value == 0)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
816 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
817 // one operand of times is 0, replace operation with 0
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
818 while (E -> operands)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
819 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
820 o = E -> operands;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
821 E -> operands = o -> next;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
822 lw_expr_destroy(o -> p);
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
823 lw_free(o);
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
824 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
825 E -> type = lw_expr_type_int;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
826 E -> value = 0;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
827 return;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
828 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
829 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
830 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
831
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
832 // sort "constants" to the start of each operand list for + and *
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
833 if (E -> value == lw_expr_oper_plus || E -> value == lw_expr_oper_times)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
834 lw_expr_simplify_sortconstfirst(E);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
835
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
836 // look for like terms and collect them together
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
837 if (E -> value == lw_expr_oper_plus)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
838 {
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
839 struct lw_expr_opers *o2;
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
840 for (o = E -> operands; o; o = o -> next)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
841 {
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
842 // skip constants
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
843 if (o -> p -> type == lw_expr_type_int)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
844 continue;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
845
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
846 // we have a term to match
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
847 // (o -> p) is first term
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
848 for (o2 = o -> next; o2; o2 = o2 -> next)
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
849 {
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
850 lw_expr_t e1, e2;
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
851
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
852 if (o2 -> p -> type == lw_expr_type_int)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
853 continue;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
854
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
855 if (lw_expr_simplify_isliketerm(o -> p, o2 -> p))
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
856 {
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
857 int coef, coef2;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
858
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
859 // we have a like term here
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
860 // do something about it
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
861 if (o -> p -> type == lw_expr_type_oper && o -> p -> value == lw_expr_oper_times)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
862 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
863 if (o -> p -> operands -> p -> type == lw_expr_type_int)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
864 coef = o -> p -> operands -> p -> value;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
865 else
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
866 coef = 1;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
867 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
868 else
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
869 coef = 1;
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
870 if (o2 -> p -> type == lw_expr_type_oper && o2 -> p -> value == lw_expr_oper_times)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
871 {
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
872 if (o2 -> p -> operands -> p -> type == lw_expr_type_int)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
873 coef2 = o2 -> p -> operands -> p -> value;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
874 else
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
875 coef2 = 1;
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
876 }
371
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
877 else
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
878 coef2 = 1;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
879 coef += coef2;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
880 e1 = lw_expr_create();
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
881 e1 -> type = lw_expr_type_oper;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
882 e1 -> value = lw_expr_oper_times;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
883 if (coef != 1)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
884 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
885 e2 = lw_expr_build(lw_expr_type_int, coef);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
886 lw_expr_add_operand(e1, e2);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
887 lw_expr_destroy(e2);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
888 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
889 lw_expr_destroy(o -> p);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
890 o -> p = e1;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
891 for (o = o2 -> p -> operands; o; o = o -> next)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
892 {
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
893 if (o -> p -> type == lw_expr_type_int)
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
894 continue;
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
895 lw_expr_add_operand(e1, o -> p);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
896 }
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
897 lw_expr_destroy(o2 -> p);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
898 o2 -> p = lw_expr_build(lw_expr_type_int, 0);
9c24d9d485b9 Much bugfixing
lost@starbug
parents: 370
diff changeset
899 goto again;
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
900 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
901 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
902 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
903 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
904
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
905
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
906 if (E -> value == lw_expr_oper_plus)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
907 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
908 int c = 0, t = 0;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
909 for (o = E -> operands; o; o = o -> next)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
910 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
911 t++;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
912 if (!(o -> p -> type == lw_expr_type_int && o -> p -> value == 0))
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
913 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
914 c++;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
915 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
916 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
917 if (c == 1)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
918 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
919 lw_expr_t r;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
920 // find the value and "move it up"
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
921 while (E -> operands)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
922 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
923 o = E -> operands;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
924 if (o -> p -> type != lw_expr_type_int || o -> p -> value != 0)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
925 {
337
04c80c51b16a Checkpoint development
lost
parents: 336
diff changeset
926 r = lw_expr_copy(o -> p);
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
927 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
928 E -> operands = o -> next;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
929 lw_expr_destroy(o -> p);
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
930 lw_free(o);
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
931 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
932 *E = *r;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
933 return;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
934 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
935 else if (c == 0)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
936 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
937 // replace with 0
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
938 while (E -> operands)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
939 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
940 o = E -> operands;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
941 E -> operands = o -> next;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
942 lw_expr_destroy(o -> p);
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
943 lw_free(o);
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
944 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
945 E -> type = lw_expr_type_int;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
946 E -> value = 0;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
947 return;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
948 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
949 else if (c != t)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
950 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
951 // collapse out zero terms
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
952 struct lw_expr_opers *o2;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
953
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
954 for (o = E -> operands; o; o = o -> next)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
955 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
956 if (o -> p -> type == lw_expr_type_int && o -> p -> value == 0)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
957 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
958 if (o == E -> operands)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
959 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
960 E -> operands = o -> next;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
961 lw_expr_destroy(o -> p);
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
962 lw_free(o);
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
963 o = E -> operands;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
964 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
965 else
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
966 {
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
967 for (o2 = E -> operands; o2 -> next == o; o2 = o2 -> next)
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
968 /* do nothing */ ;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
969 o2 -> next = o -> next;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
970 lw_expr_destroy(o -> p);
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
971 lw_free(o);
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
972 o = o2;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
973 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
974 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
975 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
976 }
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
977 return;
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
978 }
387
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
979
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
980 /* handle <int> times <plus> - expand the terms - only with exactly two operands */
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
981 if (E -> value == lw_expr_oper_times)
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
982 {
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
983 lw_expr_t t1;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
984 lw_expr_t E2;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
985 lw_expr_t E3;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
986 if (E -> operands && E -> operands -> next && !(E -> operands -> next -> next))
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
987 {
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
988 if (E -> operands -> p -> type == lw_expr_type_int)
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
989 {
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
990 /* <int> TIMES <other> */
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
991 E2 = E -> operands -> next -> p;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
992 E3 = E -> operands -> p;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
993 if (E2 -> type == lw_expr_type_oper && E2 -> value == lw_expr_oper_plus)
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
994 {
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
995 lw_free(E -> operands -> next);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
996 lw_free(E -> operands);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
997 E -> operands = NULL;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
998 E -> value = lw_expr_oper_plus;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
999
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1000 for (o = E2 -> operands; o; o = o -> next)
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1001 {
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1002 t1 = lw_expr_build(lw_expr_type_oper, lw_expr_oper_times, E3, o -> p);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1003 lw_expr_add_operand(E, t1);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1004 }
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1005
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1006 lw_expr_destroy(E2);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1007 lw_expr_destroy(E3);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1008 }
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1009 }
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1010 else if (E -> operands -> next -> p -> type == lw_expr_type_int)
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1011 {
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1012 /* <other> TIMES <int> */
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1013 E2 = E -> operands -> p;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1014 E3 = E -> operands -> next -> p;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1015 if (E2 -> type == lw_expr_type_oper && E2 -> value == lw_expr_oper_plus)
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1016 {
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1017 lw_free(E -> operands -> next);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1018 lw_free(E -> operands);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1019 E -> operands = NULL;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1020 E -> value = lw_expr_oper_plus;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1021
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1022 for (o = E2 -> operands; o; o = o -> next)
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1023 {
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1024 t1 = lw_expr_build(lw_expr_type_oper, lw_expr_oper_times, E3, o -> p);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1025 lw_expr_add_operand(E, t1);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1026 }
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1027
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1028 lw_expr_destroy(E2);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1029 lw_expr_destroy(E3);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1030 }
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1031 }
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1032 }
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1033 }
335
9f58e3bca6e3 checkpoint
lost
parents: 334
diff changeset
1034 }
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1035
431
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1036 void lw_expr_simplify_l(lw_expr_t E, void *priv)
387
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1037 {
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1038 lw_expr_t te;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1039 int c;
431
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1040
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1041 (level)++;
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1042 // bail out if the level gets too deep
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1043 if (level >= 500 || bailing)
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1044 {
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1045 bailing = 1;
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1046 level--;
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1047 if (level == 0)
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1048 bailing = 0;
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1049 return;
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1050 }
387
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1051 do
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1052 {
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1053 te = lw_expr_copy(E);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1054 lw_expr_simplify_go(E, priv);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1055 c = 0;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1056 if (lw_expr_compare(te, E) == 0)
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1057 c = 1;
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1058 lw_expr_destroy(te);
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1059 }
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1060 while (c);
431
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1061 (level)--;
387
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1062 }
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1063
431
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1064 void lw_expr_simplify(lw_expr_t E, void *priv)
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1065 {
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1066 lw_expr_simplify_l(E, priv);
d7d7e4dca3e7 Eliminated infinite loop on recursive symbol resolution with a Q&D hack: limit the depth that lw_expr_simplify can be called to globally. Not thread friendly.
lost@l-w.ca
parents: 426
diff changeset
1067 }
387
a741d2e4869f Various bugfixes; fixed lwobjdump to display symbols with unprintable characters more sensibly; start of a (nonfunctional for now) testing framework
lost@l-w.ca
parents: 382
diff changeset
1068
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1069 /*
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1070
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1071 The following two functions are co-routines which evaluate an infix
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1072 expression. lw_expr_parse_term checks for unary prefix operators then, if
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1073 none found, passes the string off the the defined helper function to
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1074 determine what the term really is. It also handles parentheses.
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1075
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1076 lw_expr_parse_expr evaluates actual expressions with infix operators. It
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1077 respects the order of operations.
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1078
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1079 The end of an expression is determined by the presence of any of the
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1080 following conditions:
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1081
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1082 1. a NUL character
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1083 2. a whitespace character
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1084 3. a )
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1085 4. a ,
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1086 5. any character that is not recognized as a term
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1087
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1088 lw_expr_parse_term returns NULL if there is no term (end of expr, etc.)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1089
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1090 lw_expr_parse_expr returns NULL if there is no expression or on a syntax
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1091 error.
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1092
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1093 */
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1094
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1095 lw_expr_t lw_expr_parse_expr(char **p, void *priv, int prec);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1096
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1097 lw_expr_t lw_expr_parse_term(char **p, void *priv)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1098 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1099 lw_expr_t term, term2;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1100
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1101 eval_next:
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1102 if (!**p || isspace(**p) || **p == ')' || **p == ']')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1103 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1104
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1105 // parentheses
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1106 if (**p == '(')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1107 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1108 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1109 term = lw_expr_parse_expr(p, priv, 0);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1110 if (**p != ')')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1111 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1112 lw_expr_destroy(term);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1113 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1114 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1115 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1116 return term;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1117 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1118
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1119 // unary +
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1120 if (**p == '+')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1121 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1122 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1123 goto eval_next;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1124 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1125
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1126 // unary - (prec 200)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1127 if (**p == '-')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1128 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1129 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1130 term = lw_expr_parse_expr(p, priv, 200);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1131 if (!term)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1132 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1133
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1134 term2 = lw_expr_build(lw_expr_type_oper, lw_expr_oper_neg, term);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1135 lw_expr_destroy(term);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1136 return term2;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1137 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1138
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1139 // unary ^ or ~ (complement, prec 200)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1140 if (**p == '^' || **p == '~')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1141 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1142 (*p)++;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1143 term = lw_expr_parse_expr(p, priv, 200);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1144 if (!term)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1145 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1146
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1147 term2 = lw_expr_build(lw_expr_type_oper, lw_expr_oper_com, term);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1148 lw_expr_destroy(term);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1149 return term2;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1150 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1151
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1152 // non-operator - pass to caller
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1153 return parse_term(p, priv);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1154 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1155
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1156 lw_expr_t lw_expr_parse_expr(char **p, void *priv, int prec)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1157 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1158 static const struct operinfo
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1159 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1160 int opernum;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1161 char *operstr;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1162 int operprec;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1163 } operators[] =
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1164 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1165 { lw_expr_oper_plus, "+", 100 },
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1166 { lw_expr_oper_minus, "-", 100 },
443
a8934dfba400 Fixed operator precedence for *
lost@l-w.ca
parents: 440
diff changeset
1167 { lw_expr_oper_times, "*", 150 },
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1168 { lw_expr_oper_divide, "/", 150 },
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1169 { lw_expr_oper_mod, "%", 150 },
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1170 { lw_expr_oper_intdiv, "\\", 150 },
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1171
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1172 { lw_expr_oper_and, "&&", 25 },
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1173 { lw_expr_oper_or, "||", 25 },
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1174
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1175 { lw_expr_oper_bwand, "&", 50 },
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1176 { lw_expr_oper_bwor, "|", 50 },
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1177 { lw_expr_oper_bwxor, "^", 50 },
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1178
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1179 { lw_expr_oper_none, "", 0 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1180 };
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1181
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1182 int opern, i;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1183 lw_expr_t term1, term2, term3;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1184
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1185 if (!**p || isspace(**p) || **p == ')' || **p == ',' || **p == ']')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1186 return NULL;
370
6b33faa21a0a Debugging output and bugfixing pass 0
lost@starbug
parents: 367
diff changeset
1187
346
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1188 term1 = lw_expr_parse_term(p, priv);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1189 if (!term1)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1190 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1191
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1192 eval_next:
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1193 if (!**p || isspace(**p) || **p == ')' || **p == ',' || **p == ']')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1194 return term1;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1195
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1196 // expecting an operator here
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1197 for (opern = 0; operators[opern].opernum != lw_expr_oper_none; opern++)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1198 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1199 for (i = 0; (*p)[i] && operators[opern].operstr[i] && ((*p)[i] == operators[opern].operstr[i]); i++)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1200 /* do nothing */;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1201 if (operators[opern].operstr[i] == '\0')
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1202 break;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1203 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1204
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1205 if (operators[opern].opernum == lw_expr_oper_none)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1206 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1207 // unrecognized operator
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1208 lw_expr_destroy(term1);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1209 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1210 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1211
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1212 // operator number is in opern, length of oper in i
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1213
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1214 // logic:
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1215 // if the precedence of this operation is <= to the "prec" flag,
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1216 // we simply return without advancing the input pointer; the operator
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1217 // will be evaluated again in the enclosing function call
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1218 if (operators[opern].operprec <= prec)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1219 return term1;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1220
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1221 // logic:
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1222 // we have a higher precedence operator here so we will advance the
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1223 // input pointer to the next term and let the expression evaluator
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1224 // loose on it after which time we will push our operator onto the
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1225 // stack and then go on with the expression evaluation
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1226 (*p) += i;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1227
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1228 // evaluate next expression(s) of higher precedence
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1229 term2 = lw_expr_parse_expr(p, priv, operators[opern].operprec);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1230 if (!term2)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1231 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1232 lw_expr_destroy(term1);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1233 return NULL;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1234 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1235
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1236 // now create operator
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1237 term3 = lw_expr_build(lw_expr_type_oper, operators[opern].opernum, term1, term2);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1238 lw_expr_destroy(term1);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1239 lw_expr_destroy(term2);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1240
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1241 // the new "expression" is the next "left operand"
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1242 term1 = term3;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1243
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1244 // continue evaluating
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1245 goto eval_next;
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1246 }
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1247
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1248 lw_expr_t lw_expr_parse(char **p, void *priv)
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1249 {
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1250 return lw_expr_parse_expr(p, priv, 0);
a82c55070624 Added expression parsing infrastructure and misc fixes
lost@starbug
parents: 342
diff changeset
1251 }
367
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
1252
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
1253 int lw_expr_testterms(lw_expr_t e, lw_expr_testfn_t *fn, void *priv)
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
1254 {
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
1255 struct lw_expr_opers *o;
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
1256 int r;
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
1257
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
1258 for (o = e -> operands; o; o = o -> next)
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
1259 {
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
1260 r = lw_expr_testterms(o -> p, fn, priv);
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
1261 if (r)
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
1262 return r;
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
1263 }
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
1264 return (fn)(e, priv);
34dfc9747f23 Reduction passes complete
lost@starbug
parents: 347
diff changeset
1265 }
376
91c0fe026940 Output incomplete references in object target
lost@starbug
parents: 372
diff changeset
1266
91c0fe026940 Output incomplete references in object target
lost@starbug
parents: 372
diff changeset
1267 int lw_expr_type(lw_expr_t e)
91c0fe026940 Output incomplete references in object target
lost@starbug
parents: 372
diff changeset
1268 {
91c0fe026940 Output incomplete references in object target
lost@starbug
parents: 372
diff changeset
1269 return e -> type;
91c0fe026940 Output incomplete references in object target
lost@starbug
parents: 372
diff changeset
1270 }
91c0fe026940 Output incomplete references in object target
lost@starbug
parents: 372
diff changeset
1271
91c0fe026940 Output incomplete references in object target
lost@starbug
parents: 372
diff changeset
1272 void *lw_expr_specptr(lw_expr_t e)
91c0fe026940 Output incomplete references in object target
lost@starbug
parents: 372
diff changeset
1273 {
91c0fe026940 Output incomplete references in object target
lost@starbug
parents: 372
diff changeset
1274 return e -> value2;
91c0fe026940 Output incomplete references in object target
lost@starbug
parents: 372
diff changeset
1275 }
448
5cccf90bf838 Fixed bug with complex external references generating invalid relocations in the object file
lost@l-w.ca
parents: 443
diff changeset
1276
5cccf90bf838 Fixed bug with complex external references generating invalid relocations in the object file
lost@l-w.ca
parents: 443
diff changeset
1277 int lw_expr_operandcount(lw_expr_t e)
5cccf90bf838 Fixed bug with complex external references generating invalid relocations in the object file
lost@l-w.ca
parents: 443
diff changeset
1278 {
5cccf90bf838 Fixed bug with complex external references generating invalid relocations in the object file
lost@l-w.ca
parents: 443
diff changeset
1279 int count = 0;
5cccf90bf838 Fixed bug with complex external references generating invalid relocations in the object file
lost@l-w.ca
parents: 443
diff changeset
1280 struct lw_expr_opers *o;
5cccf90bf838 Fixed bug with complex external references generating invalid relocations in the object file
lost@l-w.ca
parents: 443
diff changeset
1281
5cccf90bf838 Fixed bug with complex external references generating invalid relocations in the object file
lost@l-w.ca
parents: 443
diff changeset
1282 if (e -> type != lw_expr_type_oper)
5cccf90bf838 Fixed bug with complex external references generating invalid relocations in the object file
lost@l-w.ca
parents: 443
diff changeset
1283 return 0;
5cccf90bf838 Fixed bug with complex external references generating invalid relocations in the object file
lost@l-w.ca
parents: 443
diff changeset
1284
5cccf90bf838 Fixed bug with complex external references generating invalid relocations in the object file
lost@l-w.ca
parents: 443
diff changeset
1285 for (o = e -> operands; o; o = o -> next)
5cccf90bf838 Fixed bug with complex external references generating invalid relocations in the object file
lost@l-w.ca
parents: 443
diff changeset
1286 count++;
5cccf90bf838 Fixed bug with complex external references generating invalid relocations in the object file
lost@l-w.ca
parents: 443
diff changeset
1287
5cccf90bf838 Fixed bug with complex external references generating invalid relocations in the object file
lost@l-w.ca
parents: 443
diff changeset
1288 return count;
5cccf90bf838 Fixed bug with complex external references generating invalid relocations in the object file
lost@l-w.ca
parents: 443
diff changeset
1289 }