diff --git a/src/daliaIT/rough/FileSearcher.php b/src/daliaIT/rough/FileSearcher.php index aabb700..ed97061 100644 --- a/src/daliaIT/rough/FileSearcher.php +++ b/src/daliaIT/rough/FileSearcher.php @@ -1,13 +1,7 @@ bool - $isInFilter = true, - $isOutFilter = false; - #< - +{ public function search($data){ $results = glob($data); if(!$results) return array(); diff --git a/src/daliaIT/rough/MacroLib.php b/src/daliaIT/rough/MacroLib.php index ec3b802..8564134 100644 --- a/src/daliaIT/rough/MacroLib.php +++ b/src/daliaIT/rough/MacroLib.php @@ -21,4 +21,6 @@ public function setMacro($name, $macro){ $this->macros[$name] = $macro; return $this; } + + #@access public public macros array@# } \ No newline at end of file diff --git a/src/daliaIT/rough/MacroParser.php b/src/daliaIT/rough/MacroParser.php index 14ae13d..13fa336 100644 --- a/src/daliaIT/rough/MacroParser.php +++ b/src/daliaIT/rough/MacroParser.php @@ -5,17 +5,22 @@ class MacroParser { protected + #:IMacroLib $macroLib, + #:string $pattern = '/^([ \t]*)#@(.*?)(?:@#|#(.*?)#@#)/sm', + #:array $options = array( 'indentOutput' => true, 'stripMacros' => false, ); + #:this public function __construct(IMacroLib $lib){ $this->macroLib = $lib; } + #_string public function replace($input,array $options=array()){ $lib =$this->macroLib; $argParser = new MacroArgParser(); @@ -83,5 +88,4 @@ public function setPattern($value){ return $this; } #@# - } \ No newline at end of file diff --git a/src/daliaIT/rough/command/Build.php b/src/daliaIT/rough/command/Build.php index 5eddae2..62b58a4 100644 --- a/src/daliaIT/rough/command/Build.php +++ b/src/daliaIT/rough/command/Build.php @@ -15,6 +15,7 @@ class Build { protected + #:MacroParser $parser; public function __construct(){ @@ -117,4 +118,6 @@ protected function getTargetFiles($base, $buildInfo){ } return $files; } + + #@access public parser MacroParser@# } \ No newline at end of file