YetiForceCompany / YetiForceCRM

libraries/antlr/CharStream.php

Doc Comments +4 added lines

@@ -39,6 +39,7 @@ 
 	/** For infinite streams, you don't need this; primarily I'm providing
 	 *  a useful interface for action code.  Just make sure actions don't
 	 *  use this on streams that don't support it.
+	 * @return string
 	 */
 	public function substring($start, $stop);
 
@@ -55,6 +56,9 @@ 
 	/** Because this stream can rewind, we need to be able to reset the line */
 	public function setLine($line);
 
+	/**
+	 * @return void
+	 */
 	public function setCharPositionInLine($pos);
 
 	/** The index of the character relative to the beginning of the line 0..n-1 */

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 */
 
 
-class CharStreamConst{
+class CharStreamConst {
 	public static $EOF = -1;
 }
 $CharStream_EOF = -1;

libraries/antlr/CommonTokenStream.php

Doc Comments +7 added lines

@@ -62,6 +62,9 @@ 
      */
     protected $p = -1;
 
+	/**
+	 * @param VTEventConditionParserLexer $tokenSource
+	 */
 	public function __construct($tokenSource, $channel=null) {
 		$this->channel = TokenConst::$DEFAULT_CHANNEL;
 		$this->tokens = array();
@@ -131,6 +134,7 @@ 
 
 	/** Given a starting index, return the index of the first on-channel
 	 *  token.
+	 * @param integer $i
 	 */
 	protected function skipOffTokenChannels($i) {
 		$n = sizeof($this->tokens);
@@ -346,6 +350,9 @@ 
 		return $this->toStringBetween(0, sizeof($this->tokens)-1);
 	}
 
+	/**
+	 * @param integer $start
+	 */
 	public function toStringBetween($start, $stop) {
 		if ( $start<0 || $stop<0 ) {
 			return null;

Spacing +49 added lines, -49 removed lines

@@ -62,11 +62,11 @@ 
      */
     protected $p = -1;
 
-	public function __construct($tokenSource, $channel=null) {
+	public function __construct($tokenSource, $channel = null) {
 		$this->channel = TokenConst::$DEFAULT_CHANNEL;
 		$this->tokens = array();
 		$this->tokenSource = $tokenSource;
-		if($channel != null){
+		if ($channel != null) {
 			$this->channel = $channel;
 		}
 	}
@@ -86,24 +86,24 @@ 
 	protected function fillBuffer() {
 		$index = 0;
 		$t = $this->tokenSource->nextToken();
-		while ( $t!=null && $t->getType()!=CharStreamConst::$EOF ) {
+		while ($t != null && $t->getType() != CharStreamConst::$EOF) {
 			$discard = false;
 			// is there a channel override for token type?
-			if ( $this->channelOverrideMap!=null ) {
+			if ($this->channelOverrideMap != null) {
 				$channelI = $this->channelOverrideMap[$t->getType()];
-				if ( $channelI!=null ) {
+				if ($channelI != null) {
 					$t->setChannel($channelI);
 				}
 			}
-			if ( $this->discardSet!=null &&
+			if ($this->discardSet != null &&
 				 $this->discardSet->contains($t->getType()))
 			{
 				$discard = true;
 			}
-			else if ( $this->discardOffChannelTokens && $t->getChannel()!=$this->channel ) {
+			else if ($this->discardOffChannelTokens && $t->getChannel() != $this->channel) {
 				$discard = true;
 			}
-			if ( !$discard )	{
+			if (!$discard) {
 				$t->setTokenIndex($index);
 				$this->tokens[] = $t;
 				$index++;
@@ -123,7 +123,7 @@ 
 	 *  Walk past any token not on the channel the parser is listening to.
 	 */
 	public function consume() {
-		if ( $this->p<sizeof($this->tokens)) {
+		if ($this->p < sizeof($this->tokens)) {
             $this->p++;
 			$this->p = $this->skipOffTokenChannels($this->p); // leave p on valid token
         }
@@ -134,14 +134,14 @@ 
 	 */
 	protected function skipOffTokenChannels($i) {
 		$n = sizeof($this->tokens);
-		while ( $i<$n && $this->tokens[$i]->getChannel()!=$this->channel ) {
+		while ($i < $n && $this->tokens[$i]->getChannel() != $this->channel) {
 			$i++;
 		}
 		return $i;
 	}
 
 	protected function skipOffTokenChannelsReverse($i) {
-		while ( $i>=0 && $this->tokens[$i]->getChannel()!=$this->channel) {
+		while ($i >= 0 && $this->tokens[$i]->getChannel() != $this->channel) {
 			$i--;
 		}
 		return $i;
@@ -154,17 +154,17 @@ 
 	 *  channel.
 	 */
 	public function setTokenTypeChannel($ttype, $channel) {
-		if ( $this->channelOverrideMap==null ) {
+		if ($this->channelOverrideMap == null) {
 			$this->channelOverrideMap = array();
 		}
         $this->channelOverrideMap[$ttype] = $channel;
 	}
 
 	public function discardTokenType($ttype) {
-		if ( $this->discardSet==null ) {
+		if ($this->discardSet == null) {
 			$this->discardSet = new Set();
 		}
-        $this->discardSet.add($ttype);
+        $this->discardSet . add($ttype);
 	}
 
 	public function discardOffChannelTokens($discardOffChannelTokens) {
@@ -172,7 +172,7 @@ 
 	}
 
 	public function getTokens() {
-		if ( $this->p == -1 ) {
+		if ($this->p == -1) {
 			$this->fillBuffer();
 		}
 		return $this->tokens;
@@ -187,35 +187,35 @@ 
 	 *  method looks at both on and off channel tokens.
 	 */
 	public function getTokensOfTypeInSet($start, $stop, $types) {
-		if ( $p == -1 ) {
+		if ($p == -1) {
 			fillBuffer();
 		}
-		if ( $stop>=sizeof($this->tokens)) {
-			$stop=sizeof($this->tokens) - 1;
+		if ($stop >= sizeof($this->tokens)) {
+			$stop = sizeof($this->tokens) - 1;
 		}
-		if ( $start<0 ) {
-			$start=0;
+		if ($start < 0) {
+			$start = 0;
 		}
-		if ( $start>$stop ) {
+		if ($start > $stop) {
 			return null;
 		}
 
 		// list = tokens[start:stop]:{Token t, t.getType() in types}
 		$filteredTokens = array();
-		for ($i=$start; $i<=$stop; $i++) {
+		for ($i = $start; $i <= $stop; $i++) {
 			$t = $this->tokens[$i];
-			if ( $types==null || $types->member($t->getType())) {
+			if ($types == null || $types->member($t->getType())) {
 				$filteredTokens->add($t);
 			}
 		}
-		if ( sizeof($filteredTokens)==0 ) {
+		if (sizeof($filteredTokens) == 0) {
 			$filteredTokens = null;
 		}
 		return $filteredTokens;
 	}
 
 	public function getTokensOfTypeInArray($start, $stop, $types) {
-		return $this->getTokens($start, $stop,new Set(types));
+		return $this->getTokens($start, $stop, new Set(types));
 	}
 
 	public function getTokensofType($start, $stop, $ttype) {
@@ -226,29 +226,29 @@ 
 	 *  first symbol of lookahead.
 	 */
 	public function LT($k) {
-		if ( $this->p == -1 ) {
+		if ($this->p == -1) {
 			$this->fillBuffer();
 		}
-		if ( $k==0 ) {
+		if ($k == 0) {
 			return null;
 		}
-		if ( $k<0 ) {
+		if ($k < 0) {
 			return $this->LB(-$k);
 		}
 		//System.out.print("LT(p="+p+","+k+")=");
-		if ( ($this->p+$k-1) >= sizeof($this->tokens)) {
+		if (($this->p + $k - 1) >= sizeof($this->tokens)) {
 			return TokenConst::$EOF_TOKEN;
 		}
 		//System.out.println(tokens.get(p+k-1));
 		$i = $this->p;
 		$n = 1;
 		// find k good tokens
-		while ( $n<$k ) {
+		while ($n < $k) {
 			// skip off-channel tokens
-			$i = $this->skipOffTokenChannels($i+1); // leave p on valid token
+			$i = $this->skipOffTokenChannels($i + 1); // leave p on valid token
 			$n++;
 		}
-		if ( $i>=sizeof($this->tokens)) {
+		if ($i >= sizeof($this->tokens)) {
 			return TokenConst::$EOF_TOKEN;
 		}
         return $this->tokens[$i];
@@ -257,13 +257,13 @@ 
 	/** Look backwards k tokens on-channel tokens */
 	protected function LB($k) {
 		//System.out.print("LB(p="+p+","+k+") ");
-		if ( $this->p == -1 ) {
+		if ($this->p == -1) {
 			$this->fillBuffer();
 		}
-		if ( $k==0 ) {
+		if ($k == 0) {
 			return null;
 		}
-		if ( ($this->p-$k)<0 ) {
+		if (($this->p - $k) < 0) {
 			return null;
 		}
 		
@@ -271,12 +271,12 @@ 
 		$i = $this->p;
 		$n = 1;
 		// find k good tokens looking backwards
-		while ( $n<=$k ) {
+		while ($n <= $k) {
 			// skip off-channel tokens
-			$i = $this->skipOffTokenChannelsReverse($i-1); // leave p on valid token
+			$i = $this->skipOffTokenChannelsReverse($i - 1); // leave p on valid token
 			$n++;
 		}
-		if ( $i<0 ) {
+		if ($i < 0) {
 			return null;
 		}
 		return $this->tokens[$i];
@@ -295,7 +295,7 @@ 
     }
 
     public function mark() {
-		if ( $this->p == -1 ) {
+		if ($this->p == -1) {
 			$this->fillBuffer();
 		}
 		$this->lastMarker = $this->index();
@@ -315,7 +315,7 @@ 
     }
 
 	public function rewind($marker = null) {
-		if($marker===null){
+		if ($marker === null) {
 			$marker = $this->lastmarker;
 		}
 		$this->seek($marker);
@@ -340,38 +340,38 @@ 
 	}
 
 	public function toString() {
-		if ( $this->p == -1 ) {
+		if ($this->p == -1) {
 			$this->fillBuffer();
 		}
-		return $this->toStringBetween(0, sizeof($this->tokens)-1);
+		return $this->toStringBetween(0, sizeof($this->tokens) - 1);
 	}
 
 	public function toStringBetween($start, $stop) {
-		if ( $start<0 || $stop<0 ) {
+		if ($start < 0 || $stop < 0) {
 			return null;
 		}
-		if ( $this->p == -1 ) {
+		if ($this->p == -1) {
 			$this->fillBuffer();
 		}
-		if ( $stop>=sizeof($this->tokens)) {
-			$stop = sizeof($this->tokens)-1;
+		if ($stop >= sizeof($this->tokens)) {
+			$stop = sizeof($this->tokens) - 1;
 		}
 		$buf = "";
 		for ($i = $start; $i <= $stop; $i++) {
 			$t = $this->tokens[$i];
-			$buf.=$t->getText();
+			$buf .= $t->getText();
 		}
 		return $buf;
 	}
 
 	public function toStringBetweenTokens($start, $stop) {
-		if ( $start!=null && $stop!=null ) {
+		if ($start != null && $stop != null) {
 			return toString($this->start->getTokenIndex(), $this->stop->getTokenIndex());
 		}
 		return null;
 	}
 	
-	public function __toString(){
+	public function __toString() {
 		return $this->toString();
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -99,8 +99,7 @@
 				 $this->discardSet->contains($t->getType()))
 			{
 				$discard = true;
-			}
-			else if ( $this->discardOffChannelTokens && $t->getChannel()!=$this->channel ) {
+			} else if ( $this->discardOffChannelTokens && $t->getChannel()!=$this->channel ) {
 				$discard = true;
 			}
 			if ( !$discard )	{

Indentation +19 added lines, -19 removed lines

@@ -28,7 +28,7 @@ 
 */
 
 class CommonTokenStream implements TokenStream {
-    protected $tokenSource;
+	protected $tokenSource;
 
 	/** Record every single token pulled from the source so we can reproduce
 	 *  chunks of it later.
@@ -51,9 +51,9 @@ 
 	protected $lastMarker = 0;
 
 	/** The index into the tokens list of the current token (next token
-     *  to consume).  p==-1 indicates that the tokens list is empty
-     */
-    protected $p = -1;
+	 *  to consume).  p==-1 indicates that the tokens list is empty
+	 */
+	protected $p = -1;
 
 	public function __construct($tokenSource, $channel=null) {
 		$this->channel = TokenConst::$DEFAULT_CHANNEL;
@@ -106,7 +106,7 @@ 
 		// leave p pointing at first token on channel
 		$this->p = 0;
 		$this->p = $this->skipOffTokenChannels($this->p);
-    }
+	}
 
 	/** Move the input pointer to the next incoming token.  The stream
 	 *  must become active with LT(1) available.  consume() simply
@@ -117,10 +117,10 @@ 
 	 */
 	public function consume() {
 		if ( $this->p<sizeof($this->tokens)) {
-            $this->p++;
+			$this->p++;
 			$this->p = $this->skipOffTokenChannels($this->p); // leave p on valid token
-        }
-    }
+		}
+	}
 
 	/** Given a starting index, return the index of the first on-channel
 	 *  token.
@@ -150,14 +150,14 @@ 
 		if ( $this->channelOverrideMap==null ) {
 			$this->channelOverrideMap = array();
 		}
-        $this->channelOverrideMap[$ttype] = $channel;
+		$this->channelOverrideMap[$ttype] = $channel;
 	}
 
 	public function discardTokenType($ttype) {
 		if ( $this->discardSet==null ) {
 			$this->discardSet = new Set();
 		}
-        $this->discardSet.add($ttype);
+		$this->discardSet.add($ttype);
 	}
 
 	public function discardOffChannelTokens($discardOffChannelTokens) {
@@ -244,8 +244,8 @@ 
 		if ( $i>=sizeof($this->tokens)) {
 			return TokenConst::$EOF_TOKEN;
 		}
-        return $this->tokens[$i];
-    }
+		return $this->tokens[$i];
+	}
 
 	/** Look backwards k tokens on-channel tokens */
 	protected function LB($k) {
@@ -282,12 +282,12 @@ 
 		return $this->tokens[$i];
 	}
 
-    public function LA($i) {
+	public function LA($i) {
 		$lt = $this->LT($i);
-        return $this->LT($i)->getType();
-    }
+		return $this->LT($i)->getType();
+	}
 
-    public function mark() {
+	public function mark() {
 		if ( $this->p == -1 ) {
 			$this->fillBuffer();
 		}
@@ -303,9 +303,9 @@ 
 		return sizeof($this->tokens);
 	}
 
-    public function index() {
-        return $this->p;
-    }
+	public function index() {
+		return $this->p;
+	}
 
 	public function rewind($marker = null) {
 		if($marker===null){

libraries/antlr/DFA.php

Doc Comments +1 added lines

@@ -191,6 +191,7 @@
 	 *  like "\1\2\3\9", convert to short[] {2,9,9,9}.  We do this to avoid
 	 *  static short[] which generates so much init code that the class won't
 	 *  compile. :(
+	 * @param string $encodedString
 	 */
 	public static function unpackEncodedString($encodedString) {
 		$data = array();

Indentation +4 added lines, -4 removed lines

@@ -42,10 +42,10 @@
 	protected $eot;
 	protected $eof;
 	protected $min;
-    protected $max;
-    protected $accept;
-    protected $special;
-    protected $transition;
+	protected $max;
+	protected $accept;
+	protected $special;
+	protected $transition;
 
 	protected $decisionNumber;
 

Spacing +42 added lines, -42 removed lines

@@ -60,16 +60,16 @@ 
 	 *  an exception upon error.
 	 */
 	
-	public function predict($input){
-		if ( $this->debug ) {
-			echo ("Enter DFA.predict for decision ".$this->decisionNumber);
+	public function predict($input) {
+		if ($this->debug) {
+			echo ("Enter DFA.predict for decision " . $this->decisionNumber);
 		}
 		$mark = $input->mark(); // remember where decision started in input
 		try {
 			$ret = $this->_predict($input);
 			
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			$input->rewind($mark);
 			throw $e;
 		}
@@ -79,20 +79,20 @@ 
 	
 	public function _predict($input) {
 		$s = 0; // we always start at s0
-			while ( true ) {
-				if ( $this->debug ) echo ("DFA ".$this->decisionNumber." state ".$s." LA(1)=".$input->LA(1)."(".$input->LA(1)."), index=".$input->index());
+			while (true) {
+				if ($this->debug) echo ("DFA " . $this->decisionNumber . " state " . $s . " LA(1)=" . $input->LA(1) . "(" . $input->LA(1) . "), index=" . $input->index());
 				$specialState = $this->special[$s];
-				if ( $specialState>=0 ) {
-					if ( $this->debug ) {
-						echo ("DFA ".$this->decisionNumber.
-							" state ".$s." is special state ".$specialState);
+				if ($specialState >= 0) {
+					if ($this->debug) {
+						echo ("DFA " . $this->decisionNumber .
+							" state " . $s . " is special state " . $specialState);
 					}
 					$s = $this->specialStateTransition($specialState, $input);
-					if ( $this->debug ) {
-						echo ("DFA ".$this->decisionNumber.
-							" returns from special state ".$specialState." to ".s);
+					if ($this->debug) {
+						echo ("DFA " . $this->decisionNumber .
+							" returns from special state " . $specialState . " to " . s);
 					}
-					if ( $s==-1 ) {
+					if ($s == -1) {
 						$this->noViableAlt($s, $input);
 						return 0;
 					}
@@ -100,50 +100,50 @@ 
 					continue;
 				}
 				
-				if ( $this->accept[$s] >= 1 ) {
-					if ( $this->debug ) echo ("accept; predict "+$this->accept[$s]+" from state "+$this->s);
+				if ($this->accept[$s] >= 1) {
+					if ($this->debug) echo ("accept; predict "+$this->accept[$s] + " from state "+$this->s);
 					return $this->accept[$s];
 				}
 				// look for a normal char transition
 				$c = $input->LA(1); // -1 == \uFFFF, all tokens fit in 65000 space
-				if ($c>=$this->min[$s] && $c<=$this->max[$s]) {
-					$snext = $this->transition[$s][$c-$this->min[$s]]; // move to next state
-					if ( $snext < 0 ) {
+				if ($c >= $this->min[$s] && $c <= $this->max[$s]) {
+					$snext = $this->transition[$s][$c - $this->min[$s]]; // move to next state
+					if ($snext < 0) {
 						// was in range but not a normal transition
 						// must check EOT, which is like the else clause.
 						// eot[s]>=0 indicates that an EOT edge goes to another
 						// state.
-						if ( $this->eot[$s]>=0 ) {  // EOT Transition to accept state?
-							if ( $this->debug ) echo("EOT transition");
+						if ($this->eot[$s] >= 0) {  // EOT Transition to accept state?
+							if ($this->debug) echo("EOT transition");
 							$s = $this->eot[$s];
 							$input->consume();
 							continue;
 						}
-						$this->noViableAlt($s,$input);
+						$this->noViableAlt($s, $input);
 						return 0;
 					}
 					$s = $snext;
 					$input->consume();
 					continue;
 				}
-				if ( $eot[$s]>=0 ) {  // EOT Transition?
-					if ( $this->debug ) println("EOT transition");
+				if ($eot[$s] >= 0) {  // EOT Transition?
+					if ($this->debug) println("EOT transition");
 					$s = $this->eot[$s];
 					$input->consume();
 					continue;
 				}
-				if ( $c==Token::$EOF && $eof[$s]>=0 ) {  // EOF Transition to accept state?
-					if ( $this->debug ) echo ("accept via EOF; predict "+$this->accept[$eof[$s]]+" from "+$eof[$s]);
+				if ($c == Token::$EOF && $eof[$s] >= 0) {  // EOF Transition to accept state?
+					if ($this->debug) echo ("accept via EOF; predict "+$this->accept[$eof[$s]] + " from "+$eof[$s]);
 					return $this->accept[$eof[$s]];
 				}
 				// not in range and not EOF/EOT, must be invalid symbol
-				if ( $this->debug ) {
-					echo("min[".$s."]=".$this->min[$s]);
-					echo("max[".$s."]=".$this->max[$s]);
-					echo("eot[".$s."]=".$this->eot[$s]);
-					echo("eof[".$s."]=".$this->eof[$s]);
-					for ($p=0; $p<$this->transition[$s]->length; $p++) {
-						echo $this->transition[$s][$p]+" ";
+				if ($this->debug) {
+					echo("min[" . $s . "]=" . $this->min[$s]);
+					echo("max[" . $s . "]=" . $this->max[$s]);
+					echo("eot[" . $s . "]=" . $this->eot[$s]);
+					echo("eof[" . $s . "]=" . $this->eof[$s]);
+					for ($p = 0; $p < $this->transition[$s]->length; $p++) {
+						echo $this->transition[$s][$p] + " ";
 					}
 					echo "\n";
 				}
@@ -153,9 +153,9 @@ 
 
 	}
 
-	public function noViableAlt($s, $input){
-		if ($this->recognizer->state->backtracking>0) {
-			$this->recognizer->state->failed=true;
+	public function noViableAlt($s, $input) {
+		if ($this->recognizer->state->backtracking > 0) {
+			$this->recognizer->state->failed = true;
 			return;
 		}
 		$nvae =
@@ -168,7 +168,7 @@ 
 	}
 
 	/** A hook for debugging interface */
-	protected function error($nvae) { ; }
+	protected function error($nvae) {; }
 
 	public function specialStateTransition($s, $input)
 	{
@@ -187,19 +187,19 @@ 
 	public static function unpackEncodedString($encodedString) {
 		$data = array();
 		$di = 0;
-		for ($i=0,$len=strlen($encodedString); $i<$len; $i+=2) {
+		for ($i = 0, $len = strlen($encodedString); $i < $len; $i += 2) {
 			$n = charAt($encodedString, $i);
-			$v = charAt($encodedString, $i+1);
+			$v = charAt($encodedString, $i + 1);
 			// add v n times to data
-			for ($j=1; $j<=$n; $j++) {
-				if($v==0xff) $v=-1;
+			for ($j = 1; $j <= $n; $j++) {
+				if ($v == 0xff) $v = -1;
 				$data[$di++] = $v;
 			}
 		}
 		return $data;
 	}
 	
-	public function __call($fn, $params){
+	public function __call($fn, $params) {
 		return call_user_func_array(array($this->recognizer, $fn), $params);
 	}
 }

Braces +19 added lines, -8 removed lines

@@ -68,8 +68,7 @@ 
 		try {
 			$ret = $this->_predict($input);
 			
-		}
-		catch(Exception $e) {
+		} catch(Exception $e) {
 			$input->rewind($mark);
 			throw $e;
 		}
@@ -80,7 +79,9 @@ 
 	public function _predict($input) {
 		$s = 0; // we always start at s0
 			while ( true ) {
-				if ( $this->debug ) echo ("DFA ".$this->decisionNumber." state ".$s." LA(1)=".$input->LA(1)."(".$input->LA(1)."), index=".$input->index());
+				if ( $this->debug ) {
+					echo ("DFA ".$this->decisionNumber." state ".$s." LA(1)=".$input->LA(1)."(".$input->LA(1)."), index=".$input->index());
+				}
 				$specialState = $this->special[$s];
 				if ( $specialState>=0 ) {
 					if ( $this->debug ) {
@@ -101,7 +102,9 @@ 
 				}
 				
 				if ( $this->accept[$s] >= 1 ) {
-					if ( $this->debug ) echo ("accept; predict "+$this->accept[$s]+" from state "+$this->s);
+					if ( $this->debug ) {
+						echo ("accept; predict "+$this->accept[$s]+" from state "+$this->s);
+					}
 					return $this->accept[$s];
 				}
 				// look for a normal char transition
@@ -114,7 +117,9 @@ 
 						// eot[s]>=0 indicates that an EOT edge goes to another
 						// state.
 						if ( $this->eot[$s]>=0 ) {  // EOT Transition to accept state?
-							if ( $this->debug ) echo("EOT transition");
+							if ( $this->debug ) {
+								echo("EOT transition");
+							}
 							$s = $this->eot[$s];
 							$input->consume();
 							continue;
@@ -127,13 +132,17 @@ 
 					continue;
 				}
 				if ( $eot[$s]>=0 ) {  // EOT Transition?
-					if ( $this->debug ) println("EOT transition");
+					if ( $this->debug ) {
+						println("EOT transition");
+					}
 					$s = $this->eot[$s];
 					$input->consume();
 					continue;
 				}
 				if ( $c==Token::$EOF && $eof[$s]>=0 ) {  // EOF Transition to accept state?
-					if ( $this->debug ) echo ("accept via EOF; predict "+$this->accept[$eof[$s]]+" from "+$eof[$s]);
+					if ( $this->debug ) {
+						echo ("accept via EOF; predict "+$this->accept[$eof[$s]]+" from "+$eof[$s]);
+					}
 					return $this->accept[$eof[$s]];
 				}
 				// not in range and not EOF/EOT, must be invalid symbol
@@ -192,7 +201,9 @@ 
 			$v = charAt($encodedString, $i+1);
 			// add v n times to data
 			for ($j=1; $j<=$n; $j++) {
-				if($v==0xff) $v=-1;
+				if($v==0xff) {
+					$v=-1;
+				}
 				$data[$di++] = $v;
 			}
 		}

libraries/antlr/EarlyExitException.php

Doc Comments +3 added lines

@@ -31,6 +31,9 @@
 class EarlyExitException extends RecognitionException {
 	public $decisionNumber;
 
+	/**
+	 * @param integer $decisionNumber
+	 */
 	public function __construct($decisionNumber, $input) {
 		parent::__construct($input);
 		$this->decisionNumber = $decisionNumber;

libraries/antlr/IntStream.php

Doc Comments +8 added lines

@@ -31,12 +31,17 @@ 
  *  or token type sequence (such as interpretation).
  */
 interface IntStream {
+
+	/**
+	 * @return void
+	 */
 	public function consume();
 
 	/** Get int at current input pointer + i ahead where i=1 is next int.
 	 *  Negative indexes are allowed.  LA(-1) is previous token (token
 	 *  just matched).  LA(-i) where i is before first token should
 	 *  yield -1, invalid char / EOF.
+	 * @param integer $i
 	 */
 	public function LA($i);
 
@@ -62,6 +67,7 @@ 
 	 *  created after this marker argument, this routine must unroll them
 	 *  like a stack.  Assume the state the stream was in when this marker
 	 *  was created.
+	 * @return void
 	 */
 	public function rewind($marker=null);
 
@@ -72,6 +78,7 @@ 
 	 *  This must throw away resources for all markers back to the marker
 	 *  argument.  So if you're nested 5 levels of mark(), and then release(2)
 	 *  you have to release resources for depths 2..5.
+	 * @return void
 	 */
 	public function release($marker);
 
@@ -94,6 +101,7 @@ 
 	 *  The index is 0..n-1.  A seek to position i means that LA(1) will
 	 *  return the ith symbol.  So, seeking to 0 means LA(1) will return the
 	 *  first element in the stream. 
+	 * @return void
 	 */
 	public function seek($index);
 

Indentation +4 added lines, -4 removed lines

@@ -41,18 +41,18 @@
 	public function LA($i);
 
 	/** Tell the stream to start buffering if it hasn't already.  Return
-     *  current input position, index(), or some other marker so that
+	 *  current input position, index(), or some other marker so that
 	 *  when passed to rewind() you get back to the same spot.
 	 *  rewind(mark()) should not affect the input cursor.  The Lexer
 	 *  track line/col info as well as input index so its markers are
 	 *  not pure input indexes.  Same for tree node streams.
-     */
+	 */
 	public function mark();
 
 	/** Return the current input symbol index 0..n where n indicates the
-     *  last symbol has been read.  The index is the symbol about to be
+	 *  last symbol has been read.  The index is the symbol about to be
 	 *  read not the most recently read symbol.
-     */
+	 */
 	public function index();
 
 	/** Reset the stream so that next call to index would return marker.

Spacing +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	 *  like a stack.  Assume the state the stream was in when this marker
 	 *  was created.
 	 */
-	public function rewind($marker=null);
+	public function rewind($marker = null);
 
 	/** You may want to commit to a backtrack but don't want to force the
 	 *  stream to keep bookkeeping objects around for a marker that is

libraries/antlr/NoViableAltException.php

Doc Comments +3 added lines

@@ -32,6 +32,9 @@
 	public $decisionNumber;
 	public $stateNumber;
 
+	/**
+	 * @param string $grammarDecisionDescription
+	 */
 	public function __construct($grammarDecisionDescription,
 								$decisionNumber,
 								$stateNumber,

Spacing +3 added lines, -3 removed lines

@@ -44,11 +44,11 @@
 	}
 
 	public function __toString() {
-		if ( $this->input instanceof CharStream ) {
-			return "NoViableAltException('".$this->getUnexpectedType()."'@[".$this->grammarDecisionDescription."])";
+		if ($this->input instanceof CharStream) {
+			return "NoViableAltException('" . $this->getUnexpectedType() . "'@[" . $this->grammarDecisionDescription . "])";
 		}
 		else {
-			return "NoViableAltException(".$this->getUnexpectedType()."@[".$this->grammarDecisionDescription."])";
+			return "NoViableAltException(" . $this->getUnexpectedType() . "@[" . $this->grammarDecisionDescription . "])";
 		}
 	}
 }

Braces +1 added lines, -2 removed lines

@@ -46,8 +46,7 @@
 	public function __toString() {
 		if ( $this->input instanceof CharStream ) {
 			return "NoViableAltException('".$this->getUnexpectedType()."'@[".$this->grammarDecisionDescription."])";
-		}
-		else {
+		} else {
 			return "NoViableAltException(".$this->getUnexpectedType()."@[".$this->grammarDecisionDescription."])";
 		}
 	}

libraries/antlr/Set.php

Doc Comments +3 added lines

@@ -24,6 +24,9 @@
 			$this->store = $this->union($otherSet)->store;
 		}
 		
+		/**
+		 * @param integer $value
+		 */
 		public function remove($value){
 			unset($this->store[$value]);
 		}

Spacing +8 added lines, -8 removed lines

@@ -1,30 +1,30 @@
 <?php
 	//Todo: find a decent set implementation for php
-	class Set{
-		public function __construct($arr){
+	class Set {
+		public function __construct($arr) {
 			$this->store = array();
-			foreach($arr as $el){
+			foreach ($arr as $el) {
 				$this->store[$el] = $el;
 			}
 		}
 		
-		public function add($value){
+		public function add($value) {
 			$this->store[$value] = $value;
 		}
 		
-		public function member($value){
+		public function member($value) {
 			return array_key_exists($value, $this->store);
 		}
 		
-		public function union($otherSet){
+		public function union($otherSet) {
 			return new Set(array_merge($this->store, $otherSet->store));
 		}
 		
-		public function unionInPlace($otherSet){
+		public function unionInPlace($otherSet) {
 			$this->store = $this->union($otherSet)->store;
 		}
 		
-		public function remove($value){
+		public function remove($value) {
 			unset($this->store[$value]);
 		}
 	}

libraries/antlr/TokenStream.php

Doc Comments +1 added lines

@@ -55,6 +55,7 @@
 	 *  If the stream does not buffer all the tokens then it can just
 	 *  return "" or null;  Users should not access $ruleLabel.text in
 	 *  an action of course in that case.
+	 * @return null|string
 	 */
 	public function toStringBetween($start, $stop);
 	

Indentation +2 added lines, -2 removed lines

@@ -29,13 +29,13 @@
 
 /** A stream of tokens accessing tokens from a TokenSource */
 interface TokenStream extends IntStream {
-    /** Get Token at current input pointer + i ahead where i=1 is next Token.
+	/** Get Token at current input pointer + i ahead where i=1 is next Token.
 	 *  i<0 indicates tokens in the past.  So -1 is previous token and -2 is
 	 *  two tokens ago. LT(0) is undefined.  For i>=n, return Token.EOFToken.
 	 *  Return null for LT(0) and any index that results in an absolute address
 	 *  that is negative.
 	 */
-    public function LT($k);
+	public function LT($k);
 
 	/** Get a token at an absolute index i; 0..n-1.  This is really only
 	 *  needed for profiling and debugging and token stream rewriting.

libraries/HTTP_Session/Session.php

Doc Comments +3 added lines, -3 removed lines

@@ -549,7 +549,7 @@ 
 	 * Returns session variable
 	 *
 	 * @param string $name    Name of a variable
-	 * @param mixed  $default Default value of a variable if not set
+	 * @param string  $default Default value of a variable if not set
 	 *
 	 * @static
 	 * @access public
@@ -758,7 +758,7 @@ 
 	 *
 	 * @static
 	 * @access public
-	 * @return bool   The previous value of the property
+	 * @return string   The previous value of the property
 	 */
 	public static function setGcMaxLifetime($gcMaxLifetime = null)
 	{
@@ -781,7 +781,7 @@ 
 	 *
 	 * @static
 	 * @access public
-	 * @return bool   The previous value of the property
+	 * @return string   The previous value of the property
 	 */
 	public static function setGcProbability($gcProbability = null)
 	{