ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

last round of warning squashing. calling it a day now.

Browse Source
This commit is contained in:
Dr Scofield
2008-06-27 23:03:39 +00:00
parent 20940951b2
commit 748f72326d
73 changed files with 722 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/Compiler.cs
View File

@@ -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<string, bool> AllowedCompilers = new Dictionary<string, bool>(StringComparer.CurrentCultureIgnoreCase);
private Dictionary<string, enumCompileType> LanguageMapping = new Dictionary<string, enumCompileType>(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;

6
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/YP2CSConverter.cs
View File

@@ -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();

5
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/BagofAnswers.cs
View File

@@ -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
/// <summary>
/// For each result, unify the _freeVariables and unify bagArrayVariable with the associated bag.
/// </summary>
@@ -204,6 +208,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
bagOfAnswers.add();
return bagOfAnswers.resultSet(Bag);
}
#pragma warning restore 0168
/// <summary>
/// A TermArrayEqualityComparer implements IEqualityComparer to compare two object arrays using YP.termEqual.

5
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/FindallAnswers.cs
View File

@@ -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
/// <summary>
/// This is a simplified findall when the goal is a single call.
/// </summary>
@@ -99,5 +103,6 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
findallAnswers.add();
return findallAnswers.resultArray();
}
#pragma warning restore 0168
}
}

5
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor1.cs
View File

@@ -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<bool> 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()
{

5
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor2.cs
View File

@@ -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<bool> 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()
{

4
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Functor3.cs
View File

@@ -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<bool> 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()
{

14
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Parser.cs
View File

@@ -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<bool> 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<bool> 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
}
}

4
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/Variable.cs
View File

@@ -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
}
}

6
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YP.cs
View File

@@ -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<bool> univ(object Term, object List)
{
Term = YP.getValue(Term);
@@ -1414,7 +1417,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.YieldProlog
/// <returns></returns>
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
}
}

60
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/YieldProlog/YPCompiler.cs
View File

@@ -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
/// <summary>
/// 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
/// <summary>
/// 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
}
}