aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog
diff options
context:
space:
mode:
authorDr Scofield2008-06-27 23:03:39 +0000
committerDr Scofield2008-06-27 23:03:39 +0000
commit748f72326d9a295958bc9ba63bbb1a5d39030ef7 (patch)
tree58f2c9a5f6b8ffab5ad3621070aa17cb1c1e3e6b /OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog
parentmore warnings to go. (diff)
downloadopensim-SC-748f72326d9a295958bc9ba63bbb1a5d39030ef7.zip
opensim-SC-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.gz
opensim-SC-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.bz2
opensim-SC-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.xz
last round of warning squashing. calling it a day now.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog')
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/BagofAnswers.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/FindallAnswers.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor1.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor2.cs5
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor3.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Parser.cs14
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Variable.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YP.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YPCompiler.cs60
9 files changed, 76 insertions, 32 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/BagofAnswers.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/BagofAnswers.cs
index 250ad59..e6f10ca 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/BagofAnswers.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/BagofAnswers.cs
@@ -113,6 +113,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
113 } 113 }
114 } 114 }
115 115
116 // disable warning on l1, don't see how we can
117 // code this differently
118 #pragma warning disable 0168
119
116 /// <summary> 120 /// <summary>
117 /// For each result, unify the _freeVariables and unify bagArrayVariable with the associated bag. 121 /// For each result, unify the _freeVariables and unify bagArrayVariable with the associated bag.
118 /// </summary> 122 /// </summary>
@@ -204,6 +208,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
204 bagOfAnswers.add(); 208 bagOfAnswers.add();
205 return bagOfAnswers.resultSet(Bag); 209 return bagOfAnswers.resultSet(Bag);
206 } 210 }
211 #pragma warning restore 0168
207 212
208 /// <summary> 213 /// <summary>
209 /// A TermArrayEqualityComparer implements IEqualityComparer to compare two object arrays using YP.termEqual. 214 /// A TermArrayEqualityComparer implements IEqualityComparer to compare two object arrays using YP.termEqual.
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/FindallAnswers.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/FindallAnswers.cs
index cfc6788..4327715 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/FindallAnswers.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/FindallAnswers.cs
@@ -71,6 +71,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
71 return YP.unify(Bag, result); 71 return YP.unify(Bag, result);
72 } 72 }
73 73
74 // disable warning on l1, don't see how we can
75 // code this differently
76 #pragma warning disable 0168
77
74 /// <summary> 78 /// <summary>
75 /// This is a simplified findall when the goal is a single call. 79 /// This is a simplified findall when the goal is a single call.
76 /// </summary> 80 /// </summary>
@@ -99,5 +103,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
99 findallAnswers.add(); 103 findallAnswers.add();
100 return findallAnswers.resultArray(); 104 return findallAnswers.resultArray();
101 } 105 }
106 #pragma warning restore 0168
102 } 107 }
103} 108}
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor1.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor1.cs
index 114e338..e023984 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor1.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor1.cs
@@ -49,6 +49,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
49 { 49 {
50 } 50 }
51 51
52 // disable warning on l1, don't see how we can
53 // code this differently
54 #pragma warning disable 0168
52 public IEnumerable<bool> unify(object arg) 55 public IEnumerable<bool> unify(object arg)
53 { 56 {
54 arg = YP.getValue(arg); 57 arg = YP.getValue(arg);
@@ -67,6 +70,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
67 yield return false; 70 yield return false;
68 } 71 }
69 } 72 }
73 #pragma warning restore 0168
74
70 75
71 public override string ToString() 76 public override string ToString()
72 { 77 {
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor2.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor2.cs
index 132d417..432d328 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor2.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor2.cs
@@ -51,6 +51,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
51 { 51 {
52 } 52 }
53 53
54 // disable warning on l1, don't see how we can
55 // code this differently
56 #pragma warning disable 0168
54 public IEnumerable<bool> unify(object arg) 57 public IEnumerable<bool> unify(object arg)
55 { 58 {
56 arg = YP.getValue(arg); 59 arg = YP.getValue(arg);
@@ -72,6 +75,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
72 yield return false; 75 yield return false;
73 } 76 }
74 } 77 }
78 #pragma warning restore 0168
79
75 80
76 public override string ToString() 81 public override string ToString()
77 { 82 {
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor3.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor3.cs
index 064ec19..b429608 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor3.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor3.cs
@@ -53,6 +53,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
53 { 53 {
54 } 54 }
55 55
56 // disable warning on l1, don't see how we can
57 // code this differently
58 #pragma warning disable 0168
56 public IEnumerable<bool> unify(object arg) 59 public IEnumerable<bool> unify(object arg)
57 { 60 {
58 arg = YP.getValue(arg); 61 arg = YP.getValue(arg);
@@ -77,6 +80,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
77 yield return false; 80 yield return false;
78 } 81 }
79 } 82 }
83 #pragma warning restore 0168
80 84
81 public override string ToString() 85 public override string ToString()
82 { 86 {
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Parser.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Parser.cs
index b2fad45..3ceb0df 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Parser.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Parser.cs
@@ -44,6 +44,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
44 yield return false; 44 yield return false;
45 } 45 }
46 46
47 // disable warning on l1, don't see how we can
48 // code this differently
49 #pragma warning disable 0168, 0219
50
47 // Debug: Hand-modify this central predicate to do tail recursion. 51 // Debug: Hand-modify this central predicate to do tail recursion.
48 public static IEnumerable<bool> read_tokens(object arg1, object arg2, object arg3) 52 public static IEnumerable<bool> read_tokens(object arg1, object arg2, object arg3)
49 { 53 {
@@ -188,7 +192,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
188 // Compiler output follows. 192 // Compiler output follows.
189 193
190 class YPInnerClass { } 194 class YPInnerClass { }
191 static Type getDeclaringClass() { return typeof(YPInnerClass).DeclaringType; } 195 // static Type getDeclaringClass() { return typeof(YPInnerClass).DeclaringType; }
192 196
193 public static IEnumerable<bool> parseInput(object TermList) 197 public static IEnumerable<bool> parseInput(object TermList)
194 { 198 {
@@ -224,11 +228,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
224 if (YP.termEqual(Term, Atom.a(@"end_of_file"))) 228 if (YP.termEqual(Term, Atom.a(@"end_of_file")))
225 { 229 {
226 yield break; 230 yield break;
227 goto cutIf1; 231 // goto cutIf1;
228 } 232 }
229 yield return false; 233 yield return false;
230 cutIf1: 234 // cutIf1:
231 { } 235 // { }
232 } 236 }
233 } 237 }
234 } 238 }
@@ -4452,6 +4456,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
4452 { } 4456 { }
4453 } 4457 }
4454 } 4458 }
4455 4459 #pragma warning restore 0168, 0219
4456 } 4460 }
4457} 4461}
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Variable.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Variable.cs
index 7829770..281fb42 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Variable.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Variable.cs
@@ -92,8 +92,12 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
92 } 92 }
93 else 93 else
94 { 94 {
95 // disable warning on l1, don't see how we can
96 // code this differently
97 #pragma warning disable 0168
95 foreach (bool l1 in YP.unify(this, arg)) 98 foreach (bool l1 in YP.unify(this, arg))
96 yield return false; 99 yield return false;
100 #pragma warning restore 0168
97 } 101 }
98 } 102 }
99 103
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YP.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YP.cs
index 68cfd3e..31f007f 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YP.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YP.cs
@@ -561,6 +561,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
561 return _repeat; 561 return _repeat;
562 } 562 }
563 563
564 // disable warning on l1, don't see how we can
565 // code this differently
566 #pragma warning disable 0168
564 public static IEnumerable<bool> univ(object Term, object List) 567 public static IEnumerable<bool> univ(object Term, object List)
565 { 568 {
566 Term = YP.getValue(Term); 569 Term = YP.getValue(Term);
@@ -1414,7 +1417,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
1414 /// <returns></returns> 1417 /// <returns></returns>
1415 public static void script_event(object script_event, object script_params) 1418 public static void script_event(object script_event, object script_params)
1416 { 1419 {
1417 string function = ((Atom)YP.getValue(script_event))._name; 1420 // string function = ((Atom)YP.getValue(script_event))._name;
1418 object[] array = ListPair.toArray(script_params); 1421 object[] array = ListPair.toArray(script_params);
1419 if (array == null) 1422 if (array == null)
1420 return; // YP.fail(); 1423 return; // YP.fail();
@@ -1640,5 +1643,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
1640 throw new NotImplementedException(); 1643 throw new NotImplementedException();
1641 } 1644 }
1642 } 1645 }
1646 #pragma warning restore 0168
1643 } 1647 }
1644} 1648}
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YPCompiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YPCompiler.cs
index 572583b..8a22388 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YPCompiler.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YPCompiler.cs
@@ -202,6 +202,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
202 return YP.unify(Symbol, Atom.a(Base.ToString() + ++((CompilerState)State)._gensymCounter)); 202 return YP.unify(Symbol, Atom.a(Base.ToString() + ++((CompilerState)State)._gensymCounter));
203 } 203 }
204 204
205 // disable warning on l1, don't see how we can
206 // code this differently
207 #pragma warning disable 0168
205 public static bool isDetNoneOut(object State, object Term) 208 public static bool isDetNoneOut(object State, object Term)
206 { 209 {
207 State = YP.getValue(State); 210 State = YP.getValue(State);
@@ -239,6 +242,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
239 242
240 return false; 243 return false;
241 } 244 }
245 #pragma warning restore 0168
242 246
243 /// <summary> 247 /// <summary>
244 /// Return false if any of args is out, otherwise true. 248 /// Return false if any of args is out, otherwise true.
@@ -275,6 +279,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
275 } 279 }
276 } 280 }
277 281
282 // disable warning on l1, don't see how we can
283 // code this differently
284 #pragma warning disable 0168, 0219
285
278 /// <summary> 286 /// <summary>
279 /// Use makeFunctionPseudoCode, convertFunctionCSharp and compileAnonymousFunction 287 /// Use makeFunctionPseudoCode, convertFunctionCSharp and compileAnonymousFunction
280 /// to return an anonymous YP.IClause for the Head and Body of a rule clause. 288 /// to return an anonymous YP.IClause for the Head and Body of a rule clause.
@@ -395,7 +403,7 @@ namespace Temporary {
395 public static void repeatWrite(object arg1, object N) 403 public static void repeatWrite(object arg1, object N)
396 { 404 {
397 { 405 {
398 object _Value = arg1; 406 // object _Value = arg1;
399 if (YP.termEqual(N, 0)) 407 if (YP.termEqual(N, 0))
400 { 408 {
401 return; 409 return;
@@ -470,7 +478,7 @@ namespace Temporary {
470 public static void processCompilerDirectives(object arg1, object arg2) 478 public static void processCompilerDirectives(object arg1, object arg2)
471 { 479 {
472 { 480 {
473 object _State = arg2; 481 // object _State = arg2;
474 foreach (bool l2 in YP.unify(arg1, Atom.NIL)) 482 foreach (bool l2 in YP.unify(arg1, Atom.NIL))
475 { 483 {
476 return; 484 return;
@@ -3939,12 +3947,12 @@ namespace Temporary {
3939 YP.nl(); 3947 YP.nl();
3940 convertStatementListCSharp(RestStatements, Level); 3948 convertStatementListCSharp(RestStatements, Level);
3941 return; 3949 return;
3942 goto cutIf1; 3950 // goto cutIf1;
3943 } 3951 }
3944 convertStatementListCSharp(RestStatements, Level); 3952 convertStatementListCSharp(RestStatements, Level);
3945 return; 3953 return;
3946 cutIf1: 3954 // cutIf1:
3947 { } 3955 // { }
3948 } 3956 }
3949 } 3957 }
3950 { 3958 {
@@ -4111,12 +4119,12 @@ namespace Temporary {
4111 YP.write(Atom.a(@", ")); 4119 YP.write(Atom.a(@", "));
4112 convertArgListCSharp(Tail); 4120 convertArgListCSharp(Tail);
4113 return; 4121 return;
4114 goto cutIf1; 4122 // goto cutIf1;
4115 } 4123 }
4116 convertArgListCSharp(Tail); 4124 convertArgListCSharp(Tail);
4117 return; 4125 return;
4118 cutIf1: 4126 // cutIf1:
4119 { } 4127 // { }
4120 } 4128 }
4121 } 4129 }
4122 } 4130 }
@@ -4266,13 +4274,13 @@ namespace Temporary {
4266 YP.put_code(Code); 4274 YP.put_code(Code);
4267 convertStringCodesCSharp(RestCodes); 4275 convertStringCodesCSharp(RestCodes);
4268 return; 4276 return;
4269 goto cutIf1; 4277 // goto cutIf1;
4270 } 4278 }
4271 YP.put_code(Code); 4279 YP.put_code(Code);
4272 convertStringCodesCSharp(RestCodes); 4280 convertStringCodesCSharp(RestCodes);
4273 return; 4281 return;
4274 cutIf1: 4282 // cutIf1:
4275 { } 4283 // { }
4276 } 4284 }
4277 } 4285 }
4278 } 4286 }
@@ -4623,12 +4631,12 @@ namespace Temporary {
4623 YP.write(Atom.a(@", ")); 4631 YP.write(Atom.a(@", "));
4624 convertArgListJavascript(Tail); 4632 convertArgListJavascript(Tail);
4625 return; 4633 return;
4626 goto cutIf1; 4634 // goto cutIf1;
4627 } 4635 }
4628 convertArgListJavascript(Tail); 4636 convertArgListJavascript(Tail);
4629 return; 4637 return;
4630 cutIf1: 4638 // cutIf1:
4631 { } 4639 // { }
4632 } 4640 }
4633 } 4641 }
4634 } 4642 }
@@ -4777,7 +4785,7 @@ namespace Temporary {
4777 YP.put_code(Code); 4785 YP.put_code(Code);
4778 convertStringCodesJavascript(RestCodes); 4786 convertStringCodesJavascript(RestCodes);
4779 return; 4787 return;
4780 goto cutIf1; 4788 // goto cutIf1;
4781 } 4789 }
4782 if (YP.termEqual(Code, 92)) 4790 if (YP.termEqual(Code, 92))
4783 { 4791 {
@@ -4785,13 +4793,13 @@ namespace Temporary {
4785 YP.put_code(Code); 4793 YP.put_code(Code);
4786 convertStringCodesJavascript(RestCodes); 4794 convertStringCodesJavascript(RestCodes);
4787 return; 4795 return;
4788 goto cutIf1; 4796 // goto cutIf1;
4789 } 4797 }
4790 YP.put_code(Code); 4798 YP.put_code(Code);
4791 convertStringCodesJavascript(RestCodes); 4799 convertStringCodesJavascript(RestCodes);
4792 return; 4800 return;
4793 cutIf1: 4801 // cutIf1:
4794 { } 4802 // { }
4795 } 4803 }
4796 } 4804 }
4797 } 4805 }
@@ -5420,12 +5428,12 @@ namespace Temporary {
5420 YP.write(Atom.a(@", ")); 5428 YP.write(Atom.a(@", "));
5421 convertArgListPython(Tail); 5429 convertArgListPython(Tail);
5422 return; 5430 return;
5423 goto cutIf1; 5431 // goto cutIf1;
5424 } 5432 }
5425 convertArgListPython(Tail); 5433 convertArgListPython(Tail);
5426 return; 5434 return;
5427 cutIf1: 5435 // cutIf1:
5428 { } 5436 // { }
5429 } 5437 }
5430 } 5438 }
5431 } 5439 }
@@ -5573,7 +5581,7 @@ namespace Temporary {
5573 YP.put_code(Code); 5581 YP.put_code(Code);
5574 convertStringCodesPython(RestCodes); 5582 convertStringCodesPython(RestCodes);
5575 return; 5583 return;
5576 goto cutIf1; 5584 // goto cutIf1;
5577 } 5585 }
5578 if (YP.termEqual(Code, 92)) 5586 if (YP.termEqual(Code, 92))
5579 { 5587 {
@@ -5581,13 +5589,13 @@ namespace Temporary {
5581 YP.put_code(Code); 5589 YP.put_code(Code);
5582 convertStringCodesPython(RestCodes); 5590 convertStringCodesPython(RestCodes);
5583 return; 5591 return;
5584 goto cutIf1; 5592 // goto cutIf1;
5585 } 5593 }
5586 YP.put_code(Code); 5594 YP.put_code(Code);
5587 convertStringCodesPython(RestCodes); 5595 convertStringCodesPython(RestCodes);
5588 return; 5596 return;
5589 cutIf1: 5597 // cutIf1:
5590 { } 5598 // { }
5591 } 5599 }
5592 } 5600 }
5593 } 5601 }
@@ -5646,6 +5654,6 @@ namespace Temporary {
5646 } 5654 }
5647 } 5655 }
5648 } 5656 }
5649 5657 #pragma warning restore 0168, 0219
5650 } 5658 }
5651} 5659}