1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
--- a/src/sial_compiler/sial/instruct.cpp
+++ b/src/sial_compiler/sial/instruct.cpp
@@ -150,14 +150,14 @@
if (!HaveEnoughSize()) return;
- if (type!=setindex&&type!=get&&type!=computeint)
+ if (type!=setindex&&type!=operators::get&&type!=computeint)
{
outerror(glno,
"Internal error in instruction insert, please contact writer");
return;
}
- if (get==type)
+ if (operators::get==type)
{
if (CheckConvert(idno, nindex, indexarray)!=0)
return;
@@ -965,7 +965,7 @@
add_optable_c(type, t1, t2, t3, &instruction[i][1],
t7, lineno);
}
- else if (get==instruction[i][0])
+ else if ((operators::get)==instruction[i][0])
{
type=106;
add_optable_c(type, t1, t2, instruction[i][1]+1,
--- a/src/sial_compiler/sial/syntax.cpp
+++ b/src/sial_compiler/sial/syntax.cpp
@@ -362,7 +362,7 @@
outArray[x]==execute ||outArray[x]==doo||
outArray[x]==call||outArray[x]==iff ||
outArray[x]==create ||outArray[x]==deletee||
- outArray[x]==pardo ||outArray[x]==get||
+ outArray[x]==pardo ||outArray[x]==operators::get||
outArray[x]==prepare ||outArray[x]==request||
outArray[x]==destroye ||outArray[x]==writee||
outArray[x]==collective||outArray[x]==computeint||
@@ -1917,7 +1917,7 @@
else if (where==outArray[lexpos])
wheresyntax(lexpos, lineno);
- else if (get==outArray[lexpos])
+ else if (operators::get==outArray[lexpos])
getcomputesyntax(lexpos, lineno);
else if (prepare==outArray[lexpos])
|
