diff --git a/LibreMetaverse.LslTools/Tools/Parser.cs b/LibreMetaverse.LslTools/Tools/Parser.cs index 479e5d29..e1cc5cc3 100644 --- a/LibreMetaverse.LslTools/Tools/Parser.cs +++ b/LibreMetaverse.LslTools/Tools/Parser.cs @@ -52,7 +52,7 @@ namespace LibreMetaverse.LslTools protected bool Error(ref ParseStackEntry top, string str) { - var ns = (SYMBOL) new error(this, top); + var ns = (SYMBOL) new Error(this, top); if (this.m_debug) Console.WriteLine("Error encountered: " + str); ns.pos = top.m_value.pos; diff --git a/LibreMetaverse.LslTools/Tools/SYMBOL.cs b/LibreMetaverse.LslTools/Tools/SYMBOL.cs index 0dacb241..e5c72ec5 100644 --- a/LibreMetaverse.LslTools/Tools/SYMBOL.cs +++ b/LibreMetaverse.LslTools/Tools/SYMBOL.cs @@ -122,7 +122,7 @@ namespace LibreMetaverse.LslTools private void ConcreteSyntaxTree(string n) { - if (this is error) + if (this is Error) Console.WriteLine(n + " " + this.ToString()); else Console.WriteLine(n + "-" + this.ToString()); diff --git a/LibreMetaverse.LslTools/Tools/error.cs b/LibreMetaverse.LslTools/Tools/error.cs index 9ebc05d7..50896592 100644 --- a/LibreMetaverse.LslTools/Tools/error.cs +++ b/LibreMetaverse.LslTools/Tools/error.cs @@ -26,24 +26,24 @@ namespace LibreMetaverse.LslTools { - public class error : SYMBOL + public class Error : SYMBOL { public int state; public SYMBOL sym; - public error(Parser yyp, ParseStackEntry s) + public Error(Parser yyp, ParseStackEntry s) : base(yyp) { this.state = s.m_state; this.sym = s.m_value; } - public error(Parser yyp) + public Error(Parser yyp) : base(yyp) { } - public override string yyname => nameof (error); + public override string yyname => nameof (Error); public override string ToString() { diff --git a/LibreMetaverse.LslTools/Tools/recoveredError.cs b/LibreMetaverse.LslTools/Tools/recoveredError.cs index df7cab5f..97ba5b7e 100644 --- a/LibreMetaverse.LslTools/Tools/recoveredError.cs +++ b/LibreMetaverse.LslTools/Tools/recoveredError.cs @@ -28,7 +28,7 @@ using System; namespace LibreMetaverse.LslTools { - public class recoveredError : error + public class recoveredError : Error { public recoveredError(Parser yyp, ParseStackEntry s) : base(yyp, s) diff --git a/LibreMetaverse.LslTools/YYClass/yycs0syntax.cs b/LibreMetaverse.LslTools/YYClass/yycs0syntax.cs index 06059203..71e3f1e9 100644 --- a/LibreMetaverse.LslTools/YYClass/yycs0syntax.cs +++ b/LibreMetaverse.LslTools/YYClass/yycs0syntax.cs @@ -6662,7 +6662,7 @@ namespace YYClass public static object error_factory(Parser yyp) { - return (object) new error(yyp); + return (object) new Error(yyp); } public static object Item_20_factory(Parser yyp) diff --git a/Programs/mapgenerator/mapgenerator.cs b/Programs/mapgenerator/mapgenerator.cs index 6d16e354..598974a6 100644 --- a/Programs/mapgenerator/mapgenerator.cs +++ b/Programs/mapgenerator/mapgenerator.cs @@ -1059,28 +1059,30 @@ namespace Mapgenerator writer.WriteLine(" }"); // Write the Packet.BuildPacket() function - writer.WriteLine(@" - public static Packet BuildPacket(byte[] packetBuffer, ref int packetEnd, byte[] zeroBuffer) - { - byte[] bytes; - int i = 0; - Header header = Header.BuildHeader(packetBuffer, ref i, ref packetEnd); - if (header.Zerocoded) - { - packetEnd = Helpers.ZeroDecode(packetBuffer, packetEnd + 1, zeroBuffer) - 1; - bytes = zeroBuffer; - } - else - { - bytes = packetBuffer; - } - Array.Clear(bytes, packetEnd + 1, bytes.Length - packetEnd - 1); - - switch (header.Frequency) - { - case PacketFrequency.Low: - switch (header.ID) - {"); + writer.WriteLine(""" + + public static Packet BuildPacket(byte[] packetBuffer, ref int packetEnd, byte[] zeroBuffer) + { + byte[] bytes; + int i = 0; + Header header = Header.BuildHeader(packetBuffer, ref i, ref packetEnd); + if (header.Zerocoded) + { + packetEnd = Helpers.ZeroDecode(packetBuffer, packetEnd + 1, zeroBuffer) - 1; + bytes = zeroBuffer; + } + else + { + bytes = packetBuffer; + } + Array.Clear(bytes, packetEnd + 1, bytes.Length - packetEnd - 1); + + switch (header.Frequency) + { + case PacketFrequency.Low: + switch (header.ID) + { + """); foreach (MapPacket packet in protocol.LowMaps) if (packet != null) writer.WriteLine(" case " + packet.ID + ": return new " + packet.Name + "Packet(header, bytes, ref i);");