Mercurial > archived > louis > epitech > mq > rathaxes
annotate rathaxes_compiler_passes_fix_ref_scalar_issues_with_chunk_parameters.patch @ 131:c209851a82de
Wip, start a rewrite of the e1000 device dependent code
author | Louis Opter <kalessin@kalessin.fr> |
---|---|
date | Fri, 03 Jan 2014 15:01:47 +0100 |
parents | 518d9c8ac70c |
children |
rev | line source |
---|---|
127
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
1 # HG changeset patch |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
2 # Parent aa64f4dc928c5e844d1a7005652d059979544239 |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
3 rathaxes: fix ref/scalar issues with chunk parameters |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
4 |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
5 diff --git a/rathaxes/compiler/passes/common/rtxResolve.inc.cws b/rathaxes/compiler/passes/common/rtxResolve.inc.cws |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
6 --- a/rathaxes/compiler/passes/common/rtxResolve.inc.cws |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
7 +++ b/rathaxes/compiler/passes/common/rtxResolve.inc.cws |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
8 @@ -449,22 +449,35 @@ |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
9 } |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
10 else if (search_chunk == false) // This may be the rtx implementation chunk -> different way to resolve... |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
11 { |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
12 - if (rtxNode2cnormNode<src_p.type>(src_p, param_value) == false) |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
13 - error(RED + "Could not translate rathaxes node " + toString(src_p, true) |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
14 - + " to a resVal (containing one cnorm) node." + DEFAULT_COLOR); |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
15 - setall param_type = src_p.rtype; |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
16 - if (param_value.type == "__expr__" && param_value.operator != "__literal__") |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
17 + |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
18 + if (rtxNodeArgs_GetArgByName(src_resVals, src_p.val, src_arg) == true) |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
19 { |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
20 - local src_arg; |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
21 - local src_name = param_value.id; |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
22 - if (rtxNodeArgs_GetArgByName(src_resVals, src_name, src_arg)) |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
23 - return false; |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
24 if (rtxNodeArg_getRType(src_arg, param_type) == false) |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
25 return false; |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
26 if (rtxNodeArg_getValue(src_arg, param_value) == false) |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
27 return false; |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
28 param_name = dst_p; |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
29 } |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
30 + else |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
31 + { |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
32 + if (rtxNode2cnormNode<src_p.type>(src_p, param_value) == false) |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
33 + error(RED + "Could not translate rathaxes node " + toString(src_p, true) |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
34 + + " to a resVal (containing one cnorm) node." + DEFAULT_COLOR); |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
35 + |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
36 + setall param_type = src_p.rtype; |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
37 + if (param_value.type == "__expr__" && param_value.operator != "__literal__") |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
38 + { |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
39 + local src_arg; |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
40 + local src_name = param_value.id; |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
41 + if (rtxNodeArgs_GetArgByName(src_resVals, src_name, src_arg)) |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
42 + return false; |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
43 + if (rtxNodeArg_getRType(src_arg, param_type) == false) |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
44 + return false; |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
45 + if (rtxNodeArg_getValue(src_arg, param_value) == false) |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
46 + return false; |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
47 + param_name = dst_p; |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
48 + } |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
49 + } |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
50 } |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
51 else |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
52 { |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
53 @@ -529,7 +542,13 @@ |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
54 |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
55 // Now, resolve the loaded chunk... |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
56 local resVals; |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
57 - rtxResolve_BuildParameterResVals(resolverValues, call.args, resVals, chunkTree.tpl_params, source_tree, false); |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
58 + if (rtxResolve_BuildParameterResVals(resolverValues, call.args, resVals, chunkTree.tpl_params, source_tree, false) == false) |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
59 + { |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
60 + // TODO: should be an error, but will be break to many things at |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
61 + // this point: |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
62 + traceLine(RED + "[Error] Could not build front-end parameter resvals." + DEFAULT_COLOR); |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
63 + } |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
64 + |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
65 if (instanceChunk<chunkTree.instanceKey>(resVals, chunkTree.body, source_tree) == false) |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
66 { |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
67 increment(errcount); |
129 | 68 @@ -710,17 +729,29 @@ |
69 // First, try to retrieve value from previous resVals, otherwise build it from chunk | |
70 if (varName != "self") | |
71 { | |
72 + // | |
73 + // XXX Note: Here, we may encounter some issues if the chunk's type_map isnt properly filled | |
74 + // (encountered once, the type was scalar instead of ref) | |
75 + // | |
76 + local self_reftype = "scalar"; | |
77 + local self_rtype; | |
78 if (rtxNodeArgs_GetArgByName(resolverValues, varName, self) == true) | |
79 { | |
80 rtxNodeArg_getValue(self, self_value); | |
81 + rtxNodeArg_getRType(self, self_rtype); | |
82 + self_reftype = self_rtype.qualifier; | |
127
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
83 } |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
84 else |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
85 { |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
86 + traceLine(YELLOW + "[Warning] Using variable's identifier as resolved value (high probability to be wrong): " |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
87 + + local_node#parent.location + DEFAULT_COLOR); |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
88 clearVariable(self_value); |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
89 cnormNode_TerminalId(self_value, varName); |
72b5b4a62cc5
Wip on fixing ref/scalar issues, partly fixed
Louis Opter <louis@lse.epita.fr>
parents:
diff
changeset
|
90 } |
129 | 91 - rtxNodeArgs_AppendArg(resVal, "self", theChunk.type_map[varName], self_value); |
92 - setall self_type = theChunk.type_map[varName]; | |
93 + setall self_rtype = theChunk.type_map[varName]; | |
94 + self_rtype.qualifier = self_reftype; | |
95 + rtxNodeArgs_AppendArg(resVal, "self", self_rtype, self_value); | |
96 + setall self_type = self_rtype; | |
97 } | |
98 else | |
99 { |