1 files changed, 56 insertions, 56 deletions

diff --git a/ue3/mycpu/cprogram.h b/ue3/mycpu/cprogram.h
index 25d0ce2..27e7647 100644
--- a/ue3/mycpu/cprogram.h
+++ b/ue3/mycpu/cprogram.h
@@ -1,51 +1,41 @@
 /**
  * @module cprogram
  * @author Guenther Neuwirth (0626638), Manuel Mausz (0728348)
- * @brief  class for parsing and saving the program instuctions.
- * @date   17.04.2009
+ * @brief  CProgram extends std::vector and adds a method for parsing programfile
+ * @date   10.05.2009
  */
 
 #ifndef CPROGRAM_H
-#define CPROGRAM_H
+#define CPROGRAM_H 1
 
-#include <stdexcept>
-#include <string>
 #include <vector>
+#include <set>
 #include <map>
-#ifdef DEBUG
-# include <iostream>
-#endif
-#include "cdat.h"
+#include "cinstruction.h"
+
 /**
  * @class CProgram
  *
- * Parses a simple line based scriptfile with some limitations:
- * first function (starting a block) must be a read-command,
- * last must be a write-command (ending this block).
- *
- * read- and write-commands have hard coded parameters, number#1 being a filetype.
- * Classes handling certain filetypes must be of type CFile.
- * Custom functions will be passed to CFile::callFunc().
- *
- * On error ParserError will be thrown.
+ * CProgram extends std::vector and adds a method for parsing
+ * programfile. This adds instances of CInstruction to CProgram itself.
  */
 class CProgram
+  : public std::vector<CInstruction *>
 {
   public:
-
     /**
      * @method CProgram
      * @brief  Default ctor
-     * @param  programfile filename 
+     * @param  -
      * @return -
      * @globalvars none
-     * @exception  bad_alloc
+     * @exception  none
      * @conditions none
      */
-    CProgram(const std::string& progfile);
+    CProgram();
 
     /**
-     * @method ~CScriptparser
+     * @method ~CProgram
      * @brief  Default dtor
      * @param  -
      * @return -
@@ -55,50 +45,60 @@ class CProgram
      */
     ~CProgram();
 
-    CDat getMaxProgramCount()
-    {
-      return CDat(m_progsource.size());
-    }
-    
-    std::vector<std::string>& getInstruction(CDat linenr)
-    {
-         return m_progsource[linenr.getTypeValue()];
-    }
-    
-    std::map<std::string, unsigned int>& getJumpAddrs()
+    /**
+     * @method getLabels
+     * @brief  get reference to labels map
+     * @param  -
+     * @return reference to labels map
+     * @globalvars none
+     * @exception  none
+     * @conditions none
+     */
+    const std::map<std::string, unsigned>& getLabels() const
     {
-      return m_jumpaddr;
+      return m_labels;
     }
-#ifdef DEBUG
+
     /**
-     * @method dump
-     * @brief  Dumps the program source to ostream
-     * @param  out output stream
-     * @return -
-     * @globalvars
-     * @exception
-     * @conditions
+     * @method findLabel
+     * @brief  search for label
+     * @param  label  name of label to search for
+     * @return index of found label in program
+     * @globalvars none
+     * @exception  std::runtime_error
+     * @conditions none
      */
-    void dump(std::ostream& out);
-#endif
+    unsigned findLabel(const std::string& label) const;
 
-  protected:
     /**
-     * @method parse
-     * @brief  parse the program file
-     * @param  -
-     * @return -
+     * @method compile
+     * @brief  create instructions from parsing stream
+     * @param  in  inputstream to read from
+     * @return void
+     * @globalvars none
+     * @exception  std::runtime_error
+     * @conditions none
+     */
+    void compile(std::istream& in);
+
+#if DEBUG
+    /**
+     * @method dump
+     * @brief  dumps contents to outputstream
+     * @param  out  outputstream to write to
+     * @return void
      * @globalvars none
-     * @exception  ParserError
+     * @exception  none
      * @conditions none
      */
-     void parse();
-     
+    void dump(std::ostream& out);
+#endif
+
   private:
     /* members */
-    std::string m_programfile;
-    std::vector<std::vector<std::string> > m_progsource;
-    std::map<std::string, unsigned int> m_jumpaddr;
+    /** set of known instructions */
+    std::set<CInstruction *> m_instrset;
+    std::map<std::string, unsigned> m_labels;
 };
 
 #endif