Removed unneeded MySQL, also finished the variable parser.

Now, we have construct() to focus on!!!!

Author: Pokeman2003

Concept-Table varproc.txt

@@ -0,0 +1,57 @@
+Table variable processing
+
+Inputs:
+$position = Where the tag begins
+$tPosition = Where the tEnTableK is relative to position
+$size = The full size of the tag
+$tStart = Where the line processing ends for the first half of the tag
+$start = Where the line processing ends for the second half of the tag
+
+Implications:
+$size-$tPosition = The size of the second half of the tag
+$tPosition+1 = The size of the first half of the tag
+$position+$tPosition = Where the tEnTableK tag is. (Impossible to prove in sanitized tests.)
+$start-1 = Where the next chain tag is. (Impossible to prove in sanitized tests.)
+($size-$tPosition)-($start-($position+$tPosition)) = The length from the start to the end tag. (Impossible to prove in sanitized tests.)
+
+Proof of Implications:
+[*table.html:@tableInput]
+    $position	: 566
+    $tPosition	: 11
+    $size	: 23
+    $tStart	: 566
+    $start	: 578
+Expected size of second half: 12 (@tableInput)
+23-11 = 12 (Checks out)
+Expected size of first half: 12 (*table.html)
+11+1 = 12 (Checks out)
+
+
+[*!thisLike:@!@thisLike]
+    $position	: 616
+    $tPosition	: 10
+    $size	: 22
+    $tStart	: 617
+    $start	: 630
+Expected size of second half: 12 (@!@thisLike)
+22-10 = 12 (Checks out)
+Expected size of first half: 11 (*!thisLike)
+10+1 = 11 (Checks out)
+
+
+What we need to do:
+Process the first half of the tag for any unresolved piping.
+Process the second half of the tag for any unresolved piping, 
+	and ensure it ends with a variable or constant.
+
+First half:
+Fairly easy. if $position != $tStart, then get the first half of the tag 
+	($position, $tPosition-1), run it through the ringer.
+
+Second half:
+First, check if $position+$tPosition+1 is @ or !. If not, just give up, because it's
+	self evidently not a const or variable.
+Second step, if ($tStart+$tPosition+1) != $start, we know that the second half
+	is not lining up with what's unpiped, so we begin the pipe ringer.
+	
+Finally, we throw onto the respective stacks what we want to do. 

Engine/tEconsts.php

@@ -13,10 +13,4 @@
 	const tEnTableB = "*";	// Table tags (first is a file tag, second denotes a variable binding, third is replaced by the values)	
 	const tEnTableK = ":";
 	const tEnTableV = "^";
-	
-	// Please don't mess with these, these AREN'T settings.
-	const tEnMajor = 1;
-	const tEnMinor = 0;
-	const tEnPatch = 0;
-	const tEnCodename = "Exemplar";
 ?>

Engine/tEngine.php

@@ -1,4 +1,11 @@
 <?php
+	// This is the file you need to include whenever you wanted to run the Exemplar engine.
+	// Please don't mess with these, these AREN'T settings. Check consts for settings!
+	const tEnMajor = 1;
+	const tEnMinor = 0;
+	const tEnPatch = 0;
+	const tEnCodename = "Exemplar";
+	
 	require "tEconsts.php";
 	require "tEobject.php";
 ?>

Engine/tEobject.php

@@ -88,7 +88,7 @@ function varFile($file, $fileDepth) {
 					else
 						$finalValue = true;
 
-					if ($subStr == tEnTableK && $primaryIn == tEnTableB) { // When we find a table's K value, then we unlock finalValue and change the tPosition.
+					if ($subStr == tEnTableK && $primaryIn == tEnTableB && $tPosition == null) { // When we find a table's K value, then we unlock finalValue and change the tPosition.
 						$tPosition = $size;
 						$tStart = $start;
 						$finalValue = false;
@@ -132,66 +132,47 @@ function varFile($file, $fileDepth) {
 							}
 
 						} else { // Tables are treated through special logic due to their crazy two-part complexity. Gotta love it!
-							$rSize = $size-$tPosition; // Reduced mediary size.
-							// The first half of this is resolving the table filename. In most cases, we don't actually need to do this. That said, who knows what horrors the user has subjected this input to.							
-							if ($tStart != $position) { // Okay, so we know that this half of the table is actually a chain. Let's resolve it!
-								$testingVariable = substr($fileString, $tStart+1, $tPosition-2);
-								while (true) {
-									$toTest = substr($fileString, $tStart, 1);
-									$resolutionTest = $this->resolveValue($testingVariable, $toTest);
-									if ($resolutionTest == null) // If we've encountered an unsolvable test, abandon the plan.
-										break;
-									$testingVariable = $resolutionTest;
-									$tStart--;
-									if (substr($fileString, $start-1, 1) == tEnFile) // If the second to next tag would've been the start tag, then we've reached the end of what we needed to do.
-										break;
+							// First, we check if this is even worth it. It may not be!
+							$finalValue = substr($fileString, $position+$tPosition+1, 1);
+							if ($finalValue == tEnConst || $finalValue == tEnVar) {
+								// Now that it checks out, let's deal with the halves.
+								$inProcess = substr($fileString, $position+$tPosition+1, $size-$tPosition-1);
+								if ($tStart+$tPosition+1 != $start) { // Oh, there's a chain here!
+									$testingVariable = substr($fileString, $start, ($size-$tPosition)-($start-($position+$tPosition)));
+									while (true) {
+										$toTest = substr($fileString, $start-1, 1);
+										$resolutionTest = $this->resolveValue($testingVariable, $toTest);
+										if ($resolutionTest == null)
+											break;
+										$testingVariable = $resolutionTest;
+										$start--;
+										if ($start-1 == ($position+$tPosition+1)) // If the second to next tag would've been the start tag, then we've reached the end of what we needed to do.
+											break;
+									}
+									$inProcess = substr($fileString, $start-1, 1) . $testingVariable;
 								}
-								// At this point, we just need to throw what's left onto the stack to resolve later, if it even needs to be.
 								switch (substr($inProcess, 0, 1)) {
 									case tEnConst:
-										array_push($this->toFill[0], $testingVariable);
+										array_push($this->toFill[0], substr($inProcess, 1));
 										break;
 									case tEnVar:
-										array_push($this->toFill[1], $testingVariable);
+										array_push($this->toFill[1], substr($inProcess, 1));
 										break;
 									default:
 										break;
-								}
 							}
-							
-							// Now that the first half has been resolved, let's get to business on the second half.
-							$inProcess = substr($fileString, $start, $rSize-1);
-							if ($start != ($tPosition+$position+1)) {
-								$testingVariable = substr($fileString, $start+1, $rSize-($start-$position-$tPosition)-1);
-								while (true) {
-									$toTest = substr($fileString, $start, 1);
-									$resolutionTest = $this->resolveValue($testingVariable, $toTest);
-									if ($resolutionTest == null) // If we've encountered an unsolvable test, abandon the plan.
-										break;
-									$testingVariable = $resolutionTest;
-									$start--;
-									if (substr($fileString, $start-1, 1) == tEnTableK) // If the second to next tag would've been the start tag, then we've reached the end of what we needed to do.
-										break;
-								}
-								$inProcess = substr($testingVariable, $start, 1) . $testingVariable;
 							}
-							
-							var_dump($inProcess);
 						}
 
 						$position += $size;
-						
 					}
 				}
 				$position++; // Position incrementer.
 			}
 		}
 
-		function addValue($array, $value) {
-			echo $value;
-		}
 		// If, for whatever reason, you're looking to clear out old variables that cannot be "resolved", then this function will go through and do so.
-		// Please note that unless safe insertion is disabled, you probably won't be able to readd what you want to.
+		// Please note that unless safe insertion is disabled, you probably won't be able to re-add any complex piping without running refreshRequests().
 		public function garbage() {
 
 		}
@@ -201,7 +182,7 @@ function preen() {
 
 		}
 
-		// 
+		// Internal function to try to resolve pipes.
 		function resolveValue($checkFor, $valueType) {
 			switch ($valueType) {
 				case tEnConst:

HTML/index.php

@@ -1,26 +1,26 @@
 <?php
 	include "tEngine.php";
+	$templateFile = new tEngine("test/test.html");
 	$tableInput = array(array(tEnMajor, tEnMinor, tEnPatch, tEnCodename), 
+	
 	array(tEnMaxFiles, tEnMaxDepth, tEnTagQ, tEnTagS), 
 	array(tEnTagE, tEnTableB, tEnTableV, tEnTableK), 
-	array(tEnVar, tEnFile, tEnSafeInsert, "Left blank."));
+	array(tEnVar, tEnFile, tEnSafeInsert, $templateFile->setVariable("safeInsertTest", "Safe insert is definitely disabled!")));
 
 	const likeThis = "<b>like this</b>";
 	const thisLike = "likeThis";
 
 	$likeThis = "<i>like this</i>";
-	$templateFile = new tEngine("test/test.html");
 
 	$templateFile->setVariable("tableInput", $tableInput);
 	$templateFile->setVariable("likeThis", $likeThis);
 
+	echo $templateFile->construct();
 
-	/* var_dump($templateFile->returnConsts());
+	var_dump($templateFile->returnConsts());
 	echo "<br>";
 	var_dump($templateFile->returnVars());
 	echo "<br>";
 	var_dump($templateFile->returnSets());
-	echo "<hr>"; */
-	
-	echo $templateFile->construct();
+	echo "<hr>";
 ?>

HTML/test/test.html

@@ -13,7 +13,7 @@ <h1>Exemplar Template Engine : [!tEnMajor].[!tEnMinor].[!tEnPatch] - [!tEnCodena
 		[*table.html:@tableInput]
 	</table>
 	<table>
-		[*!thisLike:@!thisLike]
+		[*!thisLike:!thisLike]
 	</table>
 	<p>As you can see, tables are a <i>very</i> powerful feature which open up many different possibilities.</p>
 	<p>Another little interesting factoid is that file tags are first tested relative to the template, then relative to the script, and finally absolute. This means that you can place your templates folder anywhere you damn well please, and have it work just fine. Some examples include [#relativeFile.html], [#test2/relativeFile.html], and [#test3/relativeFile.html].</p>