Diff: Initialization.hpp

Revision:

5:e36e0538a903

Parent:

4:86d0d04cc055

Child:

6:d1594fd2ec5a

--- a/Initialization.hpp	Fri Sep 19 01:54:00 2014 +0000
+++ b/Initialization.hpp	Tue Sep 23 18:24:19 2014 +0000
@@ -56,19 +56,19 @@
 /***                 <Line Data Struct Initializations>                     ***/
 /******************************************************************************/
 
-struct Line{
+struct LineData{
     
-    //string fullLine;     //full line, starting from the beginning
-    int lineNumber;                     //current line number in the program txt file that is running
+    //string fullLine;          //full line, starting from the beginning
+    int lineNumber;             //current line number in the program txt file that is running
     //vector<string> word;
-    string word[15];     //array of words from the line of text, assuming no more than 15 words will be in any given line
-                                        //in this initialization there are 15 string (pointers) of size MAX_LINE_LENGTH each
-    int numWords;                       //Number of words in the given line
+    string word[50];            //array of words from the line of text, assuming no more than 50 words will be in any given line
+                                //in this initialization there are 15 string (pointers) of size MAX_LINE_LENGTH each
+    int numWords;               //Number of words in the given line
     int lineAddress;
 };
 
 //
-extern struct Line lineData;
+//extern struct Line lineData;
 
 
 
@@ -86,8 +86,8 @@
     public:
         string name;
         enum DeviceType type;
-        static Device* newDevice(int, string, Line);
-        virtual int interpret(Line&) = 0;
+        static Device* newDevice(int, string, LineData);
+        virtual int interpret(LineData&) = 0;
 };
 
 extern vector<Device*> devices; //Initialize array of devices, initially assume 15 devices will be used (will expand as needed)