aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDr Scofield2008-07-16 09:42:14 +0000
committerDr Scofield2008-07-16 09:42:14 +0000
commit1e39bfb03681302a97bbaf5e3f10034ddcb488e9 (patch)
treeb9130bae964a32b1a807bb7f94f55a27dc455bae
parentMantis#1746. Thank you kindly, nlin for pointing out that (diff)
downloadopensim-SC-1e39bfb03681302a97bbaf5e3f10034ddcb488e9.zip
opensim-SC-1e39bfb03681302a97bbaf5e3f10034ddcb488e9.tar.gz
opensim-SC-1e39bfb03681302a97bbaf5e3f10034ddcb488e9.tar.bz2
opensim-SC-1e39bfb03681302a97bbaf5e3f10034ddcb488e9.tar.xz
squashing warnings critters
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/IndexedAnswers.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YP.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/IndexedAnswers.cs7
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs4
4 files changed, 20 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/IndexedAnswers.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/IndexedAnswers.cs
index bba7d03..5810c0b 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/IndexedAnswers.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/IndexedAnswers.cs
@@ -249,6 +249,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.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 foreach (bool l1 in YP.unify(Body, Atom.a("true"))) 253 foreach (bool l1 in YP.unify(Body, Atom.a("true")))
253 { 254 {
254 // 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
@@ -259,6 +260,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
259 yield return false; 260 yield return false;
260 } 261 }
261 } 262 }
263 #pragma warning restore 0168
262 } 264 }
263 265
264 public IEnumerable<bool> retract(object Head, object Body) 266 public IEnumerable<bool> retract(object Head, object Body)
@@ -268,7 +270,9 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
268 throw new PrologException("instantiation_error", "Head is an unbound variable"); 270 throw new PrologException("instantiation_error", "Head is an unbound variable");
269 object[] arguments = YP.getFunctorArgs(Head); 271 object[] arguments = YP.getFunctorArgs(Head);
270 272
271 // We always match Head from _allAnswers, and the Body is Atom.a("true"). 273 // We always match Head from _allAnswers, and the Body is
274 // Atom.a("true").
275 #pragma warning disable 0168
272 foreach (bool l1 in YP.unify(Body, Atom.a("true"))) 276 foreach (bool l1 in YP.unify(Body, Atom.a("true")))
273 { 277 {
274 // The caller can assert another answer into this same predicate during yield, so we have to 278 // The caller can assert another answer into this same predicate during yield, so we have to
@@ -283,6 +287,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
283 } 287 }
284 } 288 }
285 } 289 }
290 #pragma warning restore 0168
286 } 291 }
287 292
288 /// <summary> 293 /// <summary>
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YP.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YP.cs
index 6c981bb..537c114 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YP.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YP.cs
@@ -673,8 +673,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
673 object[] args = new object[(int)Arity]; 673 object[] args = new object[(int)Arity];
674 for (int i = 0; i < args.Length; ++i) 674 for (int i = 0; i < args.Length; ++i)
675 args[i] = new Variable(); 675 args[i] = new Variable();
676 #pragma warning disable 0219
676 foreach (bool l1 in YP.unify(Term, Functor.make((Atom)FunctorName, args))) 677 foreach (bool l1 in YP.unify(Term, Functor.make((Atom)FunctorName, args)))
677 yield return false; 678 yield return false;
679 #pragma warning restore 0219
678 } 680 }
679 } 681 }
680 else 682 else
@@ -2399,11 +2401,13 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
2399 if (_Head == null || _Body == null) 2401 if (_Head == null || _Body == null)
2400 yield break; 2402 yield break;
2401 2403
2404 #pragma warning disable 0168
2402 foreach (bool l1 in YP.unify(Head, _Head)) 2405 foreach (bool l1 in YP.unify(Head, _Head))
2403 { 2406 {
2404 foreach (bool l2 in YP.unify(Body, _Body)) 2407 foreach (bool l2 in YP.unify(Body, _Body))
2405 yield return false; 2408 yield return false;
2406 } 2409 }
2410 #pragma warning restore 0168
2407 } 2411 }
2408 } 2412 }
2409 } 2413 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/IndexedAnswers.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/IndexedAnswers.cs
index 2bf9db7..7d41945 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/IndexedAnswers.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/IndexedAnswers.cs
@@ -249,6 +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 foreach (bool l1 in YP.unify(Body, Atom.a("true"))) 253 foreach (bool l1 in YP.unify(Body, Atom.a("true")))
253 { 254 {
254 // 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
@@ -259,6 +260,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
259 yield return false; 260 yield return false;
260 } 261 }
261 } 262 }
263 #pragma warning restore 0168
262 } 264 }
263 265
264 public IEnumerable<bool> retract(object Head, object Body) 266 public IEnumerable<bool> retract(object Head, object Body)
@@ -268,7 +270,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
268 throw new PrologException("instantiation_error", "Head is an unbound variable"); 270 throw new PrologException("instantiation_error", "Head is an unbound variable");
269 object[] arguments = YP.getFunctorArgs(Head); 271 object[] arguments = YP.getFunctorArgs(Head);
270 272
271 // We always match Head from _allAnswers, and the Body is Atom.a("true"). 273 // We always match Head from _allAnswers, and the Body is
274 // Atom.a("true").
275 #pragma warning disable 0168
272 foreach (bool l1 in YP.unify(Body, Atom.a("true"))) 276 foreach (bool l1 in YP.unify(Body, Atom.a("true")))
273 { 277 {
274 // The caller can assert another answer into this same predicate during yield, so we have to 278 // The caller can assert another answer into this same predicate during yield, so we have to
@@ -283,6 +287,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
283 } 287 }
284 } 288 }
285 } 289 }
290 #pragma warning restore 0168
286 } 291 }
287 292
288 /// <summary> 293 /// <summary>
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs
index 3d19d3e..17f2f1c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/YieldProlog/YP.cs
@@ -673,8 +673,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
673 object[] args = new object[(int)Arity]; 673 object[] args = new object[(int)Arity];
674 for (int i = 0; i < args.Length; ++i) 674 for (int i = 0; i < args.Length; ++i)
675 args[i] = new Variable(); 675 args[i] = new Variable();
676 #pragma warning disable 0219
676 foreach (bool l1 in YP.unify(Term, Functor.make((Atom)FunctorName, args))) 677 foreach (bool l1 in YP.unify(Term, Functor.make((Atom)FunctorName, args)))
677 yield return false; 678 yield return false;
679 #pragma warning restore 0219
678 } 680 }
679 } 681 }
680 else 682 else
@@ -2399,11 +2401,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.YieldProlog
2399 if (_Head == null || _Body == null) 2401 if (_Head == null || _Body == null)
2400 yield break; 2402 yield break;
2401 2403
2404 #pragma warning disable 0168
2402 foreach (bool l1 in YP.unify(Head, _Head)) 2405 foreach (bool l1 in YP.unify(Head, _Head))
2403 { 2406 {
2404 foreach (bool l2 in YP.unify(Body, _Body)) 2407 foreach (bool l2 in YP.unify(Body, _Body))
2405 yield return false; 2408 yield return false;
2406 } 2409 }
2410 #pragma warning disable 0168
2407 } 2411 }
2408 } 2412 }
2409 } 2413 }