]> Dogcows Code - chaz/carfire/blobdiff - CarFire/CarFire/CarFire/MapReader.cs
Map drawing implemented.
[chaz/carfire] / CarFire / CarFire / CarFire / MapReader.cs
index 35089ba6531d7345f15e0a164790f01f81c3d322..fbae4df99f8b7988a1e2f9f7069c7062c470af24 100644 (file)
@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;\r
 using System.Linq;\r
 using System.Runtime.Serialization;\r
-using System.Text.RegularExpressions;\r
 using Microsoft.Xna.Framework;\r
 using Microsoft.Xna.Framework.Content;\r
 using Microsoft.Xna.Framework.Graphics;\r
@@ -15,61 +14,51 @@ namespace CarFire
     /// </summary>\r
     public class MapReader : ContentTypeReader<Map>\r
     {\r
+        #region Public Exceptions\r
+\r
+        /// <summary>\r
+        /// This exception is thrown during the loading of a map if any\r
+        /// part of the map file is inconsistent with the expected format\r
+        /// and order.\r
+        /// </summary>\r
         public class ParserException : System.ApplicationException\r
         {\r
-            public ParserException()\r
-            {\r
-            }\r
+            public ParserException() {}\r
 \r
             public ParserException(string message) :\r
-                base(message)\r
-            {\r
-            }\r
+                base(message) {}\r
 \r
             public ParserException(string message, System.Exception inner) :\r
-                base(message, inner)\r
-            {\r
-            }\r
+                base(message, inner) {}\r
 \r
             protected ParserException(SerializationInfo info, StreamingContext context) :\r
-                base(info, context)\r
-            {\r
-            }\r
+                base(info, context) {}\r
         }\r
 \r
-        ContentReader mInput;\r
-        int mLineNumber = 0;\r
-        int mExpectedNumberOfLines;\r
+        #endregion\r
 \r
-        Map.Data mData;\r
 \r
+        #region Protected Methods\r
 \r
         protected override Map Read(ContentReader input, Map existingInstance)\r
         {\r
-            mInput = input;\r
-            mExpectedNumberOfLines =  mInput.ReadInt32();\r
-\r
-            ReadData();\r
-\r
-            return new Map(mData);\r
+            mInput = new LineReader(input);\r
+            ReadSectionHeaders();\r
+            return new Map(mMetadata, mGrid, mEntities);\r
         }\r
 \r
+        #endregion\r
 \r
-        #region Private Reading Methods\r
-        \r
-        string ReadLine()\r
-        {\r
-            return mInput.ReadString();\r
-        }\r
 \r
-        void ReadData()\r
+        #region Private Methods\r
+\r
+        void ReadSectionHeaders()\r
         {\r
-            mData = new Map.Data();\r
+            mMetadata = new Map.Metadata();\r
 \r
-            while (mLineNumber < mExpectedNumberOfLines)\r
+            while (!mInput.End)\r
             {\r
-                string line = ReadLine();\r
-                mLineNumber++;\r
+                string line = mInput.ReadLine();\r
 \r
                 while (line != null)\r
                 {\r
@@ -92,12 +81,12 @@ namespace CarFire
                         }\r
                         else\r
                         {\r
-                            ThrowException("Unknown section", section);\r
+                            throw new ParserException("Unexpected section on line " + mInput.LineNumber + ": " + section);\r
                         }\r
                     }\r
                     else\r
                     {\r
-                        ThrowException("Unexpected text", line);\r
+                        throw new ParserException("Unexpected text on line " + mInput.LineNumber + ": " + line);\r
                     }\r
                 }\r
             }\r
@@ -105,11 +94,9 @@ namespace CarFire
 \r
         string ReadMetadataSection()\r
         {\r
-            while (mLineNumber < mExpectedNumberOfLines)\r
+            while (!mInput.End)\r
             {\r
-                string line = ReadLine();\r
-                mLineNumber++;\r
-\r
+                string line = mInput.ReadLine();\r
                 if (!IsLineSignificant(line)) continue;\r
 \r
                 string[] pair = Parse.KeyValuePair(line);\r
@@ -117,14 +104,14 @@ namespace CarFire
                 {\r
                     if (pair[0] == "type")\r
                     {\r
-                        object type = Parse.Constant<Map.Type>(pair[1]);\r
-                        if (type != null)\r
+                        Map.Type type = Parse.Constant<Map.Type>(pair[1]);\r
+                        if (type != default(Map.Type))\r
                         {\r
-                            mData.Type = (Map.Type)type;\r
+                            mMetadata.Type = type;\r
                         }\r
                         else\r
                         {\r
-                            ThrowException("Invalid type", pair[1]);\r
+                            throw new ParserException("Unexpected type on line " + mInput.LineNumber + ": " + pair[1]);\r
                         }\r
                     }\r
                     else if (pair[0] == "dimensions")\r
@@ -132,15 +119,16 @@ namespace CarFire
                         Point? dimensions = Parse.Coordinates(pair[1]);\r
                         if (dimensions != null)\r
                         {\r
-                            mData.Dimensions = dimensions.Value;\r
-                            if (mData.Dimensions.X <= 0 || mData.Dimensions.Y <= 0)\r
+                            mMetadata.GridWidth = dimensions.Value.X;\r
+                            mMetadata.GridHeight = dimensions.Value.Y;\r
+                            if (mMetadata.GridWidth <= 0 || mMetadata.GridHeight <= 0)\r
                             {\r
-                                ThrowException("Invalid dimensions", pair[1]);\r
+                                throw new ParserException("Invalid dimensions on line " + mInput.LineNumber + ": " + pair[1]);\r
                             }\r
                         }\r
                         else\r
                         {\r
-                            ThrowException("Invalid value", pair[1]);\r
+                            throw new ParserException("Unexpected value on line " + mInput.LineNumber + ": " + pair[1]);\r
                         }\r
                     }\r
                     else if (pair[0] == "tileset")\r
@@ -148,29 +136,46 @@ namespace CarFire
                         string tileset = Parse.String(pair[1]);\r
                         if (tileset != null)\r
                         {\r
-                            mData.Tileset = tileset;\r
+                            mMetadata.Tileset = tileset;\r
                         }\r
                         else\r
                         {\r
-                            ThrowException("Invalid tileset", pair[1]);\r
+                            throw new ParserException("Unexpected tileset on line " + mInput.LineNumber + ": " + pair[1]);\r
                         }\r
                     }\r
                     else if (pair[0] == "numplayers")\r
                     {\r
-                        int[] numPlayers = Parse.Range(pair[1]);\r
-                        if (numPlayers != null)\r
+                        string[] list = Parse.List(pair[1]);\r
+                        if (list != null)\r
                         {\r
-                            mData.MinNumPlayers = numPlayers[0];\r
-                            mData.MaxNumPlayers = numPlayers[1];\r
-                            if (mData.MinNumPlayers <= 0 || mData.MaxNumPlayers <= 0 ||\r
-                                mData.MinNumPlayers > mData.MaxNumPlayers)\r
+                            foreach (string atom in list)\r
+                            {\r
+                                int[] range = Parse.Range(atom);\r
+                                if (range != null)\r
+                                {\r
+                                    for (int i = range[0]; i <= range[1]; i++)\r
+                                    {\r
+                                        mMetadata.NumPlayers.Add(i);\r
+                                    }\r
+                                    continue;\r
+                                }\r
+                                int? integer = Parse.Integer(atom);\r
+                                if (integer != null)\r
+                                {\r
+                                    mMetadata.NumPlayers.Add(integer.Value);\r
+                                    continue;\r
+                                }\r
+\r
+                                throw new ParserException("Unexpected atom on line " + mInput.LineNumber + ": " + atom);\r
+                            }\r
+                            if (mMetadata.NumPlayers.Count == 0)\r
                             {\r
-                                ThrowException("Invalid range", pair[1]);\r
+                                throw new ParserException("No numbers given on line " + mInput.LineNumber + ": " + pair[1]);\r
                             }\r
                         }\r
                         else\r
                         {\r
-                            ThrowException("Invalid value", pair[1]);\r
+                            throw new ParserException("Unexpected value on line " + mInput.LineNumber + ": " + pair[1]);\r
                         }\r
                     }\r
                     else if (pair[0] == "author")\r
@@ -178,11 +183,11 @@ namespace CarFire
                         string author = Parse.String(pair[1]);\r
                         if (author != null)\r
                         {\r
-                            mData.Author = author;\r
+                            mMetadata.Author = author;\r
                         }\r
                         else\r
                         {\r
-                            ThrowException("Invalid value", pair[1]);\r
+                            throw new ParserException("Unexpected value on line " + mInput.LineNumber + ": " + pair[1]);\r
                         }\r
                     }\r
                     else if (pair[0] == "levelname")\r
@@ -190,16 +195,16 @@ namespace CarFire
                         string level = Parse.String(pair[1]);\r
                         if (level != null)\r
                         {\r
-                            mData.Name = level;\r
+                            mMetadata.Name = level;\r
                         }\r
                         else\r
                         {\r
-                            ThrowException("Invalid value", pair[1]);\r
+                            throw new ParserException("Unexpected value on line " + mInput.LineNumber + ": " + pair[1]);\r
                         }\r
                     }\r
                     else\r
                     {\r
-                        Console.WriteLine("Unimplemented key: " + pair[0]);\r
+                        throw new ParserException("Unexpected key on line " + mInput.LineNumber + ": " + pair[0]);\r
                     }\r
                 }\r
                 else\r
@@ -213,33 +218,35 @@ namespace CarFire
 \r
         string ReadMapTableSection()\r
         {\r
-            if (mData.Dimensions.X == 0 || mData.Dimensions.Y == 0)\r
+            if (mMetadata == null || mMetadata.GridWidth == 0 || mMetadata.GridHeight == 0)\r
             {\r
-                ThrowException("Unexpected section", "You must define the map dimensions before this section.");\r
+                throw new ParserException("Unexpected section on line " + mInput.LineNumber +\r
+                    ": You must define the map dimensions before this section.");\r
             }\r
 \r
-            mData.Grid = new char[mData.Dimensions.X, mData.Dimensions.Y];\r
+            mGrid = new char[mMetadata.GridWidth, mMetadata.GridHeight];\r
 \r
             int y;\r
-            for (y = 0; y < mData.Dimensions.Y && mLineNumber < mExpectedNumberOfLines; y++)\r
+            for (y = 0; y < mMetadata.GridHeight && !mInput.End; y++)\r
             {\r
-                string line = ReadLine();\r
-                mLineNumber++;\r
+                string line = mInput.ReadLine();\r
 \r
-                if (line.Length < mData.Dimensions.X)\r
+                if (line.Length < mMetadata.GridWidth)\r
                 {\r
-                    ThrowException("Not enough characters", "Expecting " + mData.Dimensions.X + " characters.");\r
+                    throw new ParserException("Unexpected EOL on line " + mInput.LineNumber +\r
+                        ": The number of characters should match the width dimension (" + mMetadata.GridWidth + ").");\r
                 }\r
 \r
-                for (int x = 0; x < mData.Dimensions.X; x++)\r
+                for (int x = 0; x < mMetadata.GridWidth; x++)\r
                 {\r
-                    mData.Grid[x, y] = line[x];\r
+                    mGrid[x, y] = line[x];\r
                 }\r
             }\r
 \r
-            if (y < mData.Dimensions.Y)\r
+            if (y < mMetadata.GridHeight)\r
             {\r
-                ThrowException("Unexpected ", "");\r
+                throw new ParserException("Unexpected EOF on line " + mInput.LineNumber +\r
+                    ": The number of lines in this section should match the height dimension (" + mMetadata.GridHeight + ").");\r
             }\r
 \r
             return null;\r
@@ -247,15 +254,17 @@ namespace CarFire
 \r
         string ReadEntitySection(char entity)\r
         {\r
-            while (mLineNumber < mExpectedNumberOfLines)\r
+            Dictionary<string, string> pairs = new Dictionary<string, string>();\r
+            mEntities[entity] = pairs;\r
+\r
+            while (!mInput.End)\r
             {\r
-                string line = ReadLine();\r
-                mLineNumber++;\r
+                string line = mInput.ReadLine();\r
 \r
                 string[] pair = Parse.KeyValuePair(line);\r
                 if (pair != null)\r
                 {\r
-                    // TODO\r
+                    pairs[pair[0]] = pair[1];\r
                 }\r
                 else\r
                 {\r
@@ -266,22 +275,56 @@ namespace CarFire
             return null;\r
         }\r
 \r
-        #endregion\r
-\r
-\r
-        #region Private Methods\r
 \r
         bool IsLineSignificant(string line)\r
         {\r
-            if (line.Length == 0 || Regex.IsMatch(line, @"^;|^\s*$")) return false;\r
+            if (line.Trim().Length == 0 || Parse.IniComment(line) != null) return false;\r
             return true;\r
         }\r
 \r
-        void ThrowException(string problem, string text)\r
+        #endregion\r
+\r
+\r
+        #region Private Types\r
+\r
+        /// <summary>\r
+        /// This private class wraps around ContentReader to make it more\r
+        /// convenient to use it as an input stream reader.\r
+        /// </summary>\r
+        class LineReader\r
         {\r
-            throw new ParserException(problem + " on line " + mLineNumber + ": " + text);\r
+            ContentReader mInput;\r
+            int mLineNumber = 0;\r
+            int mExpectedNumberOfLines;\r
+\r
+            public LineReader(ContentReader input)\r
+            {\r
+                mInput = input;\r
+                mExpectedNumberOfLines = mInput.ReadInt32();\r
+            }\r
+\r
+            public string ReadLine()\r
+            {\r
+                mLineNumber++;\r
+                return mInput.ReadString();\r
+            }\r
+\r
+            public int LineNumber { get { return mLineNumber; } }\r
+\r
+            public bool End { get { return mLineNumber >= mExpectedNumberOfLines; } }\r
         }\r
 \r
         #endregion\r
+\r
+\r
+        #region Private Variables\r
+\r
+        Map.Metadata mMetadata;\r
+        char[,] mGrid;\r
+        Dictionary<char, Dictionary<string, string>> mEntities = new Dictionary<char, Dictionary<string, string>>();\r
+\r
+        LineReader mInput;\r
+\r
+        #endregion\r
     }\r
 }\r
This page took 0.027726 seconds and 4 git commands to generate.