Changeset 315

Timestamp:

11/27/06 17:13:09 (2 years ago)

Author:

laurentj

Message:

preprocesseur : ajout de la prise en charge de #if expression

Files:

• trunk/build/lib/preprocessor.lib.php (modified) (6 diffs)
• trunk/build/tests/ppdatas/source_if1.txt (added)
• trunk/build/tests/ppdatas/source_if2.txt (added)
• trunk/build/tests/ppdatas/source_if3.txt (added)
• trunk/build/tests/ppdatas/source_if4.txt (added)
• trunk/build/tests/ppdatas/source_if_err1.txt (added)
• trunk/build/tests/ppdatas/source_if_err2.txt (added)
• trunk/build/tests/testpreprocess.php (modified) (2 diffs)

trunk/build/lib/preprocessor.lib.php

@@ -20 +20 @@
-        '#ifxx statement is missing',
-        '#endif statement is missing',
-
+
+
+
-    );
-
-
+, $param=null
-        $this->sourceFilename = $sourceFilename;
-        $this->sourceLine = $sourceLine+1;
-        if($code > count($this->errmessages)) $code = 0;
-
+
+
+
+
+
+
-    }
-
@@ -63 +70 @@
-    const ERR_ENDIF_MISSING = 3;
-    const ERR_INVALID_FILENAME = 4;
+    const ERR_EXPR_SYNTAX = 5;
+    const ERR_EXPR_SYNTAX_TOK = 6;
-
-    public function __construct(){
@@ -171 +180 @@
-                    $source[$nb]=false;
-                }
+            }elseif(preg_match('/^\#if\s(.*)$/m',$line,$m)){
+                if( !$isOpen ){
+                    array_push($this->_blockstack, self::BLOCK_IF_NO);
+                }else{
+                    $val = $this->evalExpression($m[1], $filename,$nb);
+                    if($val){
+                        array_push($this->_blockstack, self::BLOCK_IF_YES);
+                    }else{
+                        array_push($this->_blockstack, self::BLOCK_IF_NO);
+                    }
+                }
+                $source[$nb]=false;
-
-            }elseif(preg_match('/^\#(endif|else)\s*$/m',$line,$m)){
@@ -204 +225 @@
-                        $path = realpath(dirname($filename).'/'.$path);
-                        if($path == ''){
-
+, $m[2]
-                        }
-                    }
@@ -214 +235 @@
-                        $this->_variables = $preproc->_variables;
-                    }else{
-
+,$m[2] 
-                    }
-                    if($m[1] == 'php'){
@@ -255 +276 @@
-        return $result;
-    }
+
+    protected $authorizedToken=array(T_DNUMBER, T_BOOLEAN_AND, T_BOOLEAN_OR, T_CHARACTER,
+        T_IS_EQUAL,T_IS_GREATER_OR_EQUAL,T_IS_IDENTICAL,T_IS_NOT_EQUAL,T_IS_NOT_IDENTICAL,
+        T_IS_SMALLER_OR_EQUAL, T_LOGICAL_AND, T_LOGICAL_OR, T_LOGICAL_XOR, T_LNUMBER, 
+        T_CONSTANT_ENCAPSED_STRING, T_WHITESPACE);
+
+    protected $authorizedChar = array('.', '+', '-', '/', '*','<','>', '!');
+
+    protected function evalExpression($expression, $filename,$nb){
+
+        $arr = token_get_all('<?php '.$expression.' ?>');
+        $expr ='';
+        foreach($arr as $k=>$c){
+            if(is_array($c)){
+                if($c[0] == T_OPEN_TAG){
+                    if($k != 0) throw new jExceptionPreProc($filename,$nb,self::ERR_EXPR_SYNTAX_TOK, $c[1]);
+                }elseif($c[0] == T_CLOSE_TAG){
+                    if($k != count($arr) -1) throw new jExceptionPreProc($filename,$nb,self::ERR_EXPR_SYNTAX_TOK, $c[1]);
+                }elseif($c[0] == T_STRING){
+                    if(isset($this->_variables[$c[1]]))
+                        $expr.='$this->_variables[\''.$c[1].'\']';
+                    else
+                        $expr.='""';
+                }elseif(in_array($c[0], $this->authorizedToken)){
+                    $expr .= $c[1];
+                }else{
+                    throw new jExceptionPreProc($filename,$nb,self::ERR_EXPR_SYNTAX_TOK, $c[1]);
+                }
+            }else{
+                if(in_array($c, $this->authorizedChar)){
+                    $expr .= $c;
+                }else{
+                    throw new jExceptionPreProc($filename,$nb,self::ERR_EXPR_SYNTAX_TOK, $c);
+                }
+            }
+        }
+
+        $val = null;
+
+        if(false === @eval('$val='.$expr.';')){
+            throw new jExceptionPreProc($filename,$nb,self::ERR_EXPR_SYNTAX, $expression);
+        }else{
+            return $val;
+        }
+    }
-}
-

trunk/build/tests/testpreprocess.php

@@ -105 +105 @@
-           'result7_5.txt'=>array('BAZ'=>true, 'BAR'=>true),
-          ),
+       'source_if1.txt'=>array(
+           'result2_1.txt'=>array('FOO'=>''),
+           'result2_2.txt'=>array('FOO'=>true),
+        ),
+       'source_if2.txt'=>array(
+           'result2_1.txt'=>array('FOO'=>''),
+           'result2_2.txt'=>array('FOO'=>14),
+        ),
+       'source_if3.txt'=>array(
+           'result2_1.txt'=>array('FOO'=>'', 'BAR'=>'toto'),
+           'result2_2.txt'=>array('FOO'=>'toto',  'BAR'=>'toto'),
+        ),
+       'source_if4.txt'=>array(
+           'result2_1.txt'=>array('FOO'=>true),
+           'result2_2.txt'=>array('FOO'=>false),
+        ),
-    );
-
@@ -154 +170 @@
-        'source_err5.txt'=>array(4,'source_err5.txt',7), // err invalid filename
-        'source_err6.txt'=>array(4,'subdir/inc_err.txt',11), // err invalid filename
+        'source_if_err1.txt'=>array(5,'source_if_err1.txt',5), // err syntax err expression
+        'source_if_err2.txt'=>array(6,'source_if_err2.txt',5), // err syntax err expression tok
-
-    );