aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/BagofAnswers.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/FindallAnswers.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor1.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor2.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor3.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/IndexedAnswers.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Variable.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YPCompiler.cs4
9 files changed, 22 insertions, 24 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/BagofAnswers.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/BagofAnswers.cs
index 4a4e052..bbf1a5b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/BagofAnswers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/BagofAnswers.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
115 115
116 // disable warning on l1, don't see how we can 116 // disable warning on l1, don't see how we can
117 // code this differently 117 // code this differently
118 #pragma warning disable 0168 118 #pragma warning disable 0168, 0219
119 119
120 /// <summary> 120 /// <summary>
121 /// 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.
@@ -208,7 +208,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
208 bagOfAnswers.add(); 208 bagOfAnswers.add();
209 return bagOfAnswers.resultSet(Bag); 209 return bagOfAnswers.resultSet(Bag);
210 } 210 }
211 #pragma warning restore 0168 211 #pragma warning restore 0168, 0219
212 212
213 /// <summary> 213 /// <summary>
214 /// 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/Shared/Api/Runtime/YieldProlog/FindallAnswers.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/FindallAnswers.cs
index f175494..fb9569e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/FindallAnswers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/FindallAnswers.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
73 73
74 // disable warning on l1, don't see how we can 74 // disable warning on l1, don't see how we can
75 // code this differently 75 // code this differently
76 #pragma warning disable 0168 76 #pragma warning disable 0168, 0219
77 77
78 /// <summary> 78 /// <summary>
79 /// 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.
@@ -103,6 +103,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
103 findallAnswers.add(); 103 findallAnswers.add();
104 return findallAnswers.resultArray(); 104 return findallAnswers.resultArray();
105 } 105 }
106 #pragma warning restore 0168 106 #pragma warning restore 0168, 0219
107 } 107 }
108} 108}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor1.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor1.cs
index 351114d..80d98b1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor1.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor1.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
51 51
52 // disable warning on l1, don't see how we can 52 // disable warning on l1, don't see how we can
53 // code this differently 53 // code this differently
54 #pragma warning disable 0168 54 #pragma warning disable 0168, 0219
55 /// <summary> 55 /// <summary>
56 /// If arg is another Functor1, then succeed (yield once) if this and arg have the 56 /// If arg is another Functor1, then succeed (yield once) if this and arg have the
57 /// same name and the functor args unify, otherwise fail (don't yield). 57 /// same name and the functor args unify, otherwise fail (don't yield).
@@ -78,7 +78,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
78 yield return false; 78 yield return false;
79 } 79 }
80 } 80 }
81 #pragma warning restore 0168 81 #pragma warning restore 0168, 0219
82 82
83 83
84 public override string ToString() 84 public override string ToString()
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor2.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor2.cs
index 6817d11..4c501d6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor2.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor2.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
53 53
54 // disable warning on l1, don't see how we can 54 // disable warning on l1, don't see how we can
55 // code this differently 55 // code this differently
56 #pragma warning disable 0168 56 #pragma warning disable 0168, 0219
57 /// If arg is another Functor2, then succeed (yield once) if this and arg have the 57 /// If arg is another Functor2, then succeed (yield once) if this and arg have the
58 /// same name and all functor args unify, otherwise fail (don't yield). 58 /// same name and all functor args unify, otherwise fail (don't yield).
59 /// If arg is a Variable, then call its unify to unify with this. 59 /// If arg is a Variable, then call its unify to unify with this.
@@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
79 yield return false; 79 yield return false;
80 } 80 }
81 } 81 }
82 #pragma warning restore 0168 82 #pragma warning restore 0168, 0219
83 83
84 84
85 public override string ToString() 85 public override string ToString()
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor3.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor3.cs
index b237a82..94e39c4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor3.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Functor3.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
55 55
56 // disable warning on l1, don't see how we can 56 // disable warning on l1, don't see how we can
57 // code this differently 57 // code this differently
58 #pragma warning disable 0168 58 #pragma warning disable 0168, 0219
59 /// If arg is another Functor3, then succeed (yield once) if this and arg have the 59 /// If arg is another Functor3, then succeed (yield once) if this and arg have the
60 /// same name and all functor args unify, otherwise fail (don't yield). 60 /// same name and all functor args unify, otherwise fail (don't yield).
61 /// If arg is a Variable, then call its unify to unify with this. 61 /// If arg is a Variable, then call its unify to unify with this.
@@ -84,7 +84,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
84 yield return false; 84 yield return false;
85 } 85 }
86 } 86 }
87 #pragma warning restore 0168 87 #pragma warning restore 0168, 0219
88 88
89 public override string ToString() 89 public override string ToString()
90 { 90 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/IndexedAnswers.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/IndexedAnswers.cs
index d6a339b..04357a9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/IndexedAnswers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/IndexedAnswers.cs
@@ -249,7 +249,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
249 object[] arguments = YP.getFunctorArgs(Head); 249 object[] arguments = YP.getFunctorArgs(Head);
250 250
251 // We always match Head from _allAnswers, and the Body is Atom.a("true"). 251 // We always match Head from _allAnswers, and the Body is Atom.a("true").
252 #pragma warning disable 0168 252 #pragma warning disable 0168, 0219
253 foreach (bool l1 in YP.unify(Body, Atom.a("true"))) 253 foreach (bool l1 in YP.unify(Body, Atom.a("true")))
254 { 254 {
255 // The caller can assert another answer into this same predicate during yield, so we have to 255 // The caller can assert another answer into this same predicate during yield, so we have to
@@ -260,7 +260,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
260 yield return false; 260 yield return false;
261 } 261 }
262 } 262 }
263 #pragma warning restore 0168 263 #pragma warning restore 0168, 0219
264 } 264 }
265 265
266 public IEnumerable<bool> retract(object Head, object Body) 266 public IEnumerable<bool> retract(object Head, object Body)
@@ -271,7 +271,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
271 object[] arguments = YP.getFunctorArgs(Head); 271 object[] arguments = YP.getFunctorArgs(Head);
272 272
273 // We always match Head from _allAnswers, and the Body is Atom.a("true"). 273 // We always match Head from _allAnswers, and the Body is Atom.a("true").
274 #pragma warning disable 0168 274 #pragma warning disable 0168, 0219
275 foreach (bool l1 in YP.unify(Body, Atom.a("true"))) 275 foreach (bool l1 in YP.unify(Body, Atom.a("true")))
276 { 276 {
277 // The caller can assert another answer into this same predicate during yield, so we have to 277 // The caller can assert another answer into this same predicate during yield, so we have to
@@ -286,7 +286,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
286 } 286 }
287 } 287 }
288 } 288 }
289 #pragma warning restore 0168 289 #pragma warning restore 0168, 0219
290 } 290 }
291 291
292 /// <summary> 292 /// <summary>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Variable.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Variable.cs
index a606465..ea5b7a6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Variable.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/Variable.cs
@@ -116,10 +116,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
116 { 116 {
117 // disable warning on l1, don't see how we can 117 // disable warning on l1, don't see how we can
118 // code this differently 118 // code this differently
119 #pragma warning disable 0168 119 #pragma warning disable 0168, 0219
120 foreach (bool l1 in YP.unify(this, arg)) 120 foreach (bool l1 in YP.unify(this, arg))
121 yield return false; 121 yield return false;
122 #pragma warning restore 0168 122 #pragma warning restore 0168, 0219
123 } 123 }
124 } 124 }
125 125
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs
index 2e90d74..5a9b0aa 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs
@@ -623,7 +623,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
623 623
624 // disable warning on l1, don't see how we can 624 // disable warning on l1, don't see how we can
625 // code this differently 625 // code this differently
626 #pragma warning disable 0168 626 #pragma warning disable 0168, 0219
627 public static IEnumerable<bool> univ(object Term, object List) 627 public static IEnumerable<bool> univ(object Term, object List)
628 { 628 {
629 Term = YP.getValue(Term); 629 Term = YP.getValue(Term);
@@ -704,10 +704,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
704 object[] args = new object[(int)Arity]; 704 object[] args = new object[(int)Arity];
705 for (int i = 0; i < args.Length; ++i) 705 for (int i = 0; i < args.Length; ++i)
706 args[i] = new Variable(); 706 args[i] = new Variable();
707 #pragma warning disable 0219
708 foreach (bool l1 in YP.unify(Term, Functor.make((Atom)FunctorName, args))) 707 foreach (bool l1 in YP.unify(Term, Functor.make((Atom)FunctorName, args)))
709 yield return false; 708 yield return false;
710 #pragma warning restore 0219
711 } 709 }
712 } 710 }
713 else 711 else
@@ -2632,7 +2630,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
2632 throw new NotImplementedException(); 2630 throw new NotImplementedException();
2633 } 2631 }
2634 } 2632 }
2635 #pragma warning restore 0168 2633 #pragma warning restore 0168, 0219
2636 /// <summary> 2634 /// <summary>
2637 /// A ClauseHeadAndBody is used in Compiler.compileAnonymousFunction as a base class 2635 /// A ClauseHeadAndBody is used in Compiler.compileAnonymousFunction as a base class
2638 /// in order to implement YP.IClause. After creating the object, you must call setHeadAndBody. 2636 /// in order to implement YP.IClause. After creating the object, you must call setHeadAndBody.
@@ -2653,13 +2651,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
2653 if (_Head == null || _Body == null) 2651 if (_Head == null || _Body == null)
2654 yield break; 2652 yield break;
2655 2653
2656 #pragma warning disable 0168 2654 #pragma warning disable 0168, 0219
2657 foreach (bool l1 in YP.unify(Head, _Head)) 2655 foreach (bool l1 in YP.unify(Head, _Head))
2658 { 2656 {
2659 foreach (bool l2 in YP.unify(Body, _Body)) 2657 foreach (bool l2 in YP.unify(Body, _Body))
2660 yield return false; 2658 yield return false;
2661 } 2659 }
2662 #pragma warning restore 0168 2660 #pragma warning restore 0168, 0219
2663 } 2661 }
2664 } 2662 }
2665 2663
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YPCompiler.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YPCompiler.cs
index de7f168..c6a6748 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YPCompiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YPCompiler.cs
@@ -203,7 +203,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
203 203
204 // disable warning on l1, don't see how we can 204 // disable warning on l1, don't see how we can
205 // code this differently 205 // code this differently
206 #pragma warning disable 0168,0164,0162 206 #pragma warning disable 0168, 0164, 0162, 0219
207 public static bool isDetNoneOut(object State, object Term) 207 public static bool isDetNoneOut(object State, object Term)
208 { 208 {
209 State = YP.getValue(State); 209 State = YP.getValue(State);
@@ -241,7 +241,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
241 241
242 return false; 242 return false;
243 } 243 }
244 #pragma warning restore 0168,0164,0162 244 #pragma warning restore 0168, 0164, 0162, 0219
245 245
246 /// <summary> 246 /// <summary>
247 /// Return false if any of args is out, otherwise true. 247 /// Return false if any of args is out, otherwise true.