diff --git a/FreneticScript/CommandSystem/CommandScript.cs b/FreneticScript/CommandSystem/CommandScript.cs
index f03cefe..eb3b034 100644
--- a/FreneticScript/CommandSystem/CommandScript.cs
+++ b/FreneticScript/CommandSystem/CommandScript.cs
@@ -345,7 +345,7 @@ namespace FreneticScript.CommandSystem
}
for (int i = 0; i < ccse.Entries.Length; i++)
{
- bool isCallback = ccse.Entries[i].Arguments.Count > 0 && ccse.Entries[i].Arguments[0].ToString() == "\0CALLBACK";
+ bool isCallback = false; /*ccse.Entries[i].Arguments.Count > 0 && ccse.Entries[i].Arguments[0].ToString() == "\0CALLBACK";
if (!isCallback)
{
ccse.Entries[i].Command.PreAdaptToCIL(values, i);
@@ -361,7 +361,7 @@ namespace FreneticScript.CommandSystem
if (isCallback)
{
ccse.Entries[i].Command.PreAdaptToCIL(values, i);
- }
+ }*/
}
ccse.LocalVariables = new ObjectHolder[values.CLVarID];
ccse.LocalVarNames = new string[values.CLVarID];
@@ -415,7 +415,7 @@ namespace FreneticScript.CommandSystem
}
ccse.MainCompiledRunnable = (CompiledCommandRunnable)Activator.CreateInstance(t_c);
ccse.MainCompiledRunnable.CSEntry = ccse;
-#if SAVE
+#if !SAVE
StringBuilder outp = new StringBuilder();
for (int i = 0; i < ilgen.Codes.Count; i++)
{
@@ -483,7 +483,7 @@ namespace FreneticScript.CommandSystem
if (returnable == null)
{
throw new ErrorInducedException("Error in command line " + ccse.Entries[i].ScriptLine + ": (" + ccse.Entries[i].CommandLine
- + "): Invalid tag top-handler '" + tab.Start.Name + "' for tag: " + tab.ToString());
+ + "): Invalid tag top-handler '" + tab.Start.Name + "' for tag: ");
}
for (int x = 1; x < tab.Bits.Length; x++)
{
@@ -501,14 +501,14 @@ namespace FreneticScript.CommandSystem
if (tsh == null || tsh.Meta.ReturnTypeResult == null)
{
throw new ErrorInducedException("Error in command line " + ccse.Entries[i].ScriptLine + ": (" + ccse.Entries[i].CommandLine
- + "): Invalid tag ReturnType '" + tsh.Meta.ReturnType + "' for tag: " + tab.ToString());
+ + "): Invalid tag ReturnType '" + tsh.Meta.ReturnType + "' for tag: ");
}
returnable = tsh.Meta.ReturnTypeResult;
}
else
{
throw new ErrorInducedException("Error in command line " + ccse.Entries[i].ScriptLine + ": (" + ccse.Entries[i].CommandLine
- + "): Invalid sub-tag '" + key + "' for tag: " + tab.ToString());
+ + "): Invalid sub-tag '" + key + "' for tag: ");
}
}
ilgen.DeclareLocal(typeof(TemplateObject)); // TemplateObject 'o'.
diff --git a/FreneticScript/TagHandlers/TagBit.cs b/FreneticScript/TagHandlers/TagBit.cs
index 9f4e356..43a10cb 100644
--- a/FreneticScript/TagHandlers/TagBit.cs
+++ b/FreneticScript/TagHandlers/TagBit.cs
@@ -53,13 +53,17 @@ namespace FreneticScript.TagHandlers
/// <returns>The tag input text.</returns>
public override string ToString()
{
+ if (Key == null)
+ {
+ return "Null!";
+ }
if (Variable == null || Variable.Bits.Count == 0)
{
return Key;
}
else if (Key.StartsWith("\0"))
{
- return "[" + OVar.ToString() + "]";
+ return "[" + OVar + "]";
}
else
{
diff --git a/FreneticScript/TagHandlers/TagParser.cs b/FreneticScript/TagHandlers/TagParser.cs
index 40997ff..312fac5 100644
--- a/FreneticScript/TagHandlers/TagParser.cs
+++ b/FreneticScript/TagHandlers/TagParser.cs
@@ -482,6 +482,9 @@ namespace FreneticScript.TagHandlers
bit.Variable = new Argument();
}
bit.Key = split[x];
+ Console.WriteLine("Split[" + x + "] is " + split[x]);
+ bits.Add(bit);
+ //bit.Key = split[x];
bits.Add(bit);
}
TagArgumentBit tab = new TagArgumentBit(CommandSystem, bits.ToArray());