From 748f72326d9a295958bc9ba63bbb1a5d39030ef7 Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Fri, 27 Jun 2008 23:03:39 +0000 Subject: last round of warning squashing. calling it a day now. --- .../DotNetEngine/Compiler/LSL/Compiler.cs | 4 +- .../DotNetEngine/Compiler/LSL/YP2CSConverter.cs | 6 ++- .../Compiler/YieldProlog/BagofAnswers.cs | 5 ++ .../Compiler/YieldProlog/FindallAnswers.cs | 5 ++ .../DotNetEngine/Compiler/YieldProlog/Functor1.cs | 5 ++ .../DotNetEngine/Compiler/YieldProlog/Functor2.cs | 5 ++ .../DotNetEngine/Compiler/YieldProlog/Functor3.cs | 4 ++ .../DotNetEngine/Compiler/YieldProlog/Parser.cs | 14 +++-- .../DotNetEngine/Compiler/YieldProlog/Variable.cs | 4 ++ .../DotNetEngine/Compiler/YieldProlog/YP.cs | 6 ++- .../Compiler/YieldProlog/YPCompiler.cs | 60 ++++++++++++---------- 11 files changed, 83 insertions(+), 35 deletions(-) (limited to 'OpenSim/Region/ScriptEngine/DotNetEngine') diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs index 3f53456..0d3c8c6 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs @@ -65,7 +65,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL private enumCompileType DefaultCompileLanguage; private bool WriteScriptSourceToDebugFile; private bool CompileWithDebugInformation; - private bool CleanUpOldScriptsOnStartup; + // private bool CleanUpOldScriptsOnStartup; private Dictionary AllowedCompilers = new Dictionary(StringComparer.CurrentCultureIgnoreCase); private Dictionary LanguageMapping = new Dictionary(StringComparer.CurrentCultureIgnoreCase); @@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL // Get some config WriteScriptSourceToDebugFile = m_scriptEngine.ScriptConfigSource.GetBoolean("WriteScriptSourceToDebugFile", true); CompileWithDebugInformation = m_scriptEngine.ScriptConfigSource.GetBoolean("CompileWithDebugInformation", true); - CleanUpOldScriptsOnStartup = m_scriptEngine.ScriptConfigSource.GetBoolean("CleanUpOldScriptsOnStartup", true); + // CleanUpOldScriptsOnStartup = m_scriptEngine.ScriptConfigSource.GetBoolean("CleanUpOldScriptsOnStartup", true); // Get file prefix from scriptengine name and make it file system safe: FilePrefix = m_scriptEngine.ScriptEngineName; diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/YP2CSConverter.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/YP2CSConverter.cs index 0bd3b0c..b615baa 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/YP2CSConverter.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/YP2CSConverter.cs @@ -69,11 +69,14 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL YP.tell(myCS_SW); //Console.WriteLine("Mycode\n ===================================\n" + myCode+"\n"); + // disable warning on l1, don't see how we can + // code this differently + #pragma warning disable 0168 foreach (bool l1 in Parser.parseInput(TermList)) { foreach (bool l2 in YPCompiler.makeFunctionPseudoCode(TermList, FunctionCode)) { - ListPair VFC = new ListPair(FunctionCode, new Variable()); + // ListPair VFC = new ListPair(FunctionCode, new Variable()); //Console.WriteLine("-------------------------") //Console.WriteLine(FunctionCode.ToString()) //Console.WriteLine("-------------------------") @@ -81,6 +84,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL //YPCompiler.convertStringCodesCSharp(VFC); } } + #pragma warning restore 0168 YP.seen(); myCS_SW.Close(); YP.told(); 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 } } + // disable warning on l1, don't see how we can + // code this differently + #pragma warning disable 0168 + /// /// For each result, unify the _freeVariables and unify bagArrayVariable with the associated bag. /// @@ -204,6 +208,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog bagOfAnswers.add(); return bagOfAnswers.resultSet(Bag); } + #pragma warning restore 0168 /// /// 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 return YP.unify(Bag, result); } + // disable warning on l1, don't see how we can + // code this differently + #pragma warning disable 0168 + /// /// This is a simplified findall when the goal is a single call. /// @@ -99,5 +103,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog findallAnswers.add(); return findallAnswers.resultArray(); } + #pragma warning restore 0168 } } 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 { } + // disable warning on l1, don't see how we can + // code this differently + #pragma warning disable 0168 public IEnumerable unify(object arg) { arg = YP.getValue(arg); @@ -67,6 +70,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog yield return false; } } + #pragma warning restore 0168 + public override string ToString() { 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 { } + // disable warning on l1, don't see how we can + // code this differently + #pragma warning disable 0168 public IEnumerable unify(object arg) { arg = YP.getValue(arg); @@ -72,6 +75,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog yield return false; } } + #pragma warning restore 0168 + public override string ToString() { 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 { } + // disable warning on l1, don't see how we can + // code this differently + #pragma warning disable 0168 public IEnumerable unify(object arg) { arg = YP.getValue(arg); @@ -77,6 +80,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog yield return false; } } + #pragma warning restore 0168 public override string ToString() { 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 yield return false; } + // disable warning on l1, don't see how we can + // code this differently + #pragma warning disable 0168, 0219 + // Debug: Hand-modify this central predicate to do tail recursion. public static IEnumerable read_tokens(object arg1, object arg2, object arg3) { @@ -188,7 +192,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog // Compiler output follows. class YPInnerClass { } - static Type getDeclaringClass() { return typeof(YPInnerClass).DeclaringType; } + // static Type getDeclaringClass() { return typeof(YPInnerClass).DeclaringType; } public static IEnumerable parseInput(object TermList) { @@ -224,11 +228,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog if (YP.termEqual(Term, Atom.a(@"end_of_file"))) { yield break; - goto cutIf1; + // goto cutIf1; } yield return false; - cutIf1: - { } + // cutIf1: + // { } } } } @@ -4452,6 +4456,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog { } } } - + #pragma warning restore 0168, 0219 } } 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 } else { + // disable warning on l1, don't see how we can + // code this differently + #pragma warning disable 0168 foreach (bool l1 in YP.unify(this, arg)) yield return false; + #pragma warning restore 0168 } } 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 return _repeat; } + // disable warning on l1, don't see how we can + // code this differently + #pragma warning disable 0168 public static IEnumerable univ(object Term, object List) { Term = YP.getValue(Term); @@ -1414,7 +1417,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog /// public static void script_event(object script_event, object script_params) { - string function = ((Atom)YP.getValue(script_event))._name; + // string function = ((Atom)YP.getValue(script_event))._name; object[] array = ListPair.toArray(script_params); if (array == null) return; // YP.fail(); @@ -1640,5 +1643,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog throw new NotImplementedException(); } } + #pragma warning restore 0168 } } 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 return YP.unify(Symbol, Atom.a(Base.ToString() + ++((CompilerState)State)._gensymCounter)); } + // disable warning on l1, don't see how we can + // code this differently + #pragma warning disable 0168 public static bool isDetNoneOut(object State, object Term) { State = YP.getValue(State); @@ -239,6 +242,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog return false; } + #pragma warning restore 0168 /// /// Return false if any of args is out, otherwise true. @@ -275,6 +279,10 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog } } + // disable warning on l1, don't see how we can + // code this differently + #pragma warning disable 0168, 0219 + /// /// Use makeFunctionPseudoCode, convertFunctionCSharp and compileAnonymousFunction /// to return an anonymous YP.IClause for the Head and Body of a rule clause. @@ -395,7 +403,7 @@ namespace Temporary { public static void repeatWrite(object arg1, object N) { { - object _Value = arg1; + // object _Value = arg1; if (YP.termEqual(N, 0)) { return; @@ -470,7 +478,7 @@ namespace Temporary { public static void processCompilerDirectives(object arg1, object arg2) { { - object _State = arg2; + // object _State = arg2; foreach (bool l2 in YP.unify(arg1, Atom.NIL)) { return; @@ -3939,12 +3947,12 @@ namespace Temporary { YP.nl(); convertStatementListCSharp(RestStatements, Level); return; - goto cutIf1; + // goto cutIf1; } convertStatementListCSharp(RestStatements, Level); return; - cutIf1: - { } + // cutIf1: + // { } } } { @@ -4111,12 +4119,12 @@ namespace Temporary { YP.write(Atom.a(@", ")); convertArgListCSharp(Tail); return; - goto cutIf1; + // goto cutIf1; } convertArgListCSharp(Tail); return; - cutIf1: - { } + // cutIf1: + // { } } } } @@ -4266,13 +4274,13 @@ namespace Temporary { YP.put_code(Code); convertStringCodesCSharp(RestCodes); return; - goto cutIf1; + // goto cutIf1; } YP.put_code(Code); convertStringCodesCSharp(RestCodes); return; - cutIf1: - { } + // cutIf1: + // { } } } } @@ -4623,12 +4631,12 @@ namespace Temporary { YP.write(Atom.a(@", ")); convertArgListJavascript(Tail); return; - goto cutIf1; + // goto cutIf1; } convertArgListJavascript(Tail); return; - cutIf1: - { } + // cutIf1: + // { } } } } @@ -4777,7 +4785,7 @@ namespace Temporary { YP.put_code(Code); convertStringCodesJavascript(RestCodes); return; - goto cutIf1; + // goto cutIf1; } if (YP.termEqual(Code, 92)) { @@ -4785,13 +4793,13 @@ namespace Temporary { YP.put_code(Code); convertStringCodesJavascript(RestCodes); return; - goto cutIf1; + // goto cutIf1; } YP.put_code(Code); convertStringCodesJavascript(RestCodes); return; - cutIf1: - { } + // cutIf1: + // { } } } } @@ -5420,12 +5428,12 @@ namespace Temporary { YP.write(Atom.a(@", ")); convertArgListPython(Tail); return; - goto cutIf1; + // goto cutIf1; } convertArgListPython(Tail); return; - cutIf1: - { } + // cutIf1: + // { } } } } @@ -5573,7 +5581,7 @@ namespace Temporary { YP.put_code(Code); convertStringCodesPython(RestCodes); return; - goto cutIf1; + // goto cutIf1; } if (YP.termEqual(Code, 92)) { @@ -5581,13 +5589,13 @@ namespace Temporary { YP.put_code(Code); convertStringCodesPython(RestCodes); return; - goto cutIf1; + // goto cutIf1; } YP.put_code(Code); convertStringCodesPython(RestCodes); return; - cutIf1: - { } + // cutIf1: + // { } } } } @@ -5646,6 +5654,6 @@ namespace Temporary { } } } - + #pragma warning restore 0168, 0219 } } -- cgit v1.1