Updated class location table.

[gosa.git] / include / sieve / class_My_Parser.inc

diff --git a/include/sieve/class_My_Parser.inc b/include/sieve/class_My_Parser.inc
index b0ef7ea7654f2a45b273765176e2ab807d934d99..ac99301a6f0406dac55cad68e4cf97fb160530c5 100644 (file)
--- a/include/sieve/class_My_Parser.inc
+++ b/include/sieve/class_My_Parser.inc
@@ -1,12 +1,22 @@
 <?php
 
+/* String used to indent the different code blocks */
 define("SIEVE_INDENT_TAB","  ");
 
+
 /* This class is inherited from the original 'Parser'
  *  class written by Heiko Hund
  */
 class My_Parser extends Parser 
 {
+       var $parent = NULL;
+       var $registeredExtensions_ =array();
+
+       function My_Parser($parent)
+       {
+               $this->registeredExtensions_ = array();         
+               $this->parent = $parent;
+       }
 
        function execute()
        {
@@ -15,21 +25,32 @@ class My_Parser extends Parser
        }
        
 
+       /* Check if there are errors, collect them and return them */
+       function check()
+       {
+               return($this->tree_->check());
+       }
+       
+
        /* Initiate parser, but use some other 
      *  classes, that are rewritten.
      */
        function parse($script) 
        {
+               $script = preg_replace("/^###GOSA/","",$script);
+
+               $this->registeredExtensions_ = array();
         $this->status_text = "incomplete";
         $this->script_ = $script;
-        $this->tree_ = new My_Tree(@Scanner::scriptStart());
+        $this->tree_ = new My_Tree(@Scanner::scriptStart(),$this);
         $this->tree_->setDumpFunc(array(&$this, 'dumpToken_'));
-        $this->scanner_ = new Scanner($this->script_);
+        $this->scanner_ = new My_Scanner($this->script_);
         $this->scanner_->setCommentFunc(array($this, 'comment_'));
 
         if ($this->commands_($this->tree_->getRoot()) &&
             $this->scanner_->nextTokenIs('script-end'))
         {
+                       $this->scanner_->nextToken(); 
             return $this->success_('success');
         }
 
@@ -39,7 +60,7 @@ class My_Parser extends Parser
        
        function get_sieve_script()
        {
-               return($this->tree_->get_sieve_script());
+               return("###GOSA\n".$this->tree_->get_sieve_script());
        }               
 
        
@@ -49,19 +70,9 @@ class My_Parser extends Parser
        }
 
 
-       /* Should be obsolete in the end. */
-       function dumpToken_(&$token)
+       function dumpParseTree()
        {
-               if (is_array($token))
-               {
-                       $str = "<" . $token['text'] . "> ";
-                       foreach ($token as $k => $v)
-                       {
-                               $str .= " $k:$v";
-                       }
-                       return $str;
-               }
-               return strval($token);
+               return $this->tree_->execute();
        }
 }
 ?>