--- parser3/tests/152.html	2007/02/09 18:52:28	1.3
+++ parser3/tests/152.html	2007/11/27 10:56:47	1.6
@@ -3,6 +3,10 @@
 
 $sEmpty[]
 ^$sEmpty[]<br />
+$sTrue[true]
+^$sTrue[true]<br />
+$sFalse[false]
+^$sFalse[false]<br />
 $sZero[0]
 ^$sZero[0]<br />
 $sOne[1]
@@ -10,6 +14,25 @@ $sOne[1]
 $sTwo[2]
 ^$sTwo[2]<br /><br />
 
+$dZero(0.0)
+^$dZero(0.0)<br />
+$dOne(1.1)
+^$dOne(1.1)<br />
+$dTwo(2.2)
+^$dTwo(2.2)<br /><br />
+
+$iZero(^dZero.int[])
+^$iZero(^^dZero.int[])<br />
+$iOne(^dOne.int[])
+^$iOne(^^dOne.int[])<br />
+$iTwo(^dTwo.int[])
+^$iTwo(^^dTwo.int[])<br /><br />
+
+$bTrue(1==1)
+^$bTrue(1==1)<br />
+$bFalse(1==0)
+^$bFalse(1==0)<br /><br />
+
 $dtDate[^date::create(2007;01;02;03;04;05)]
 ^$dtDate[^^date::create(2007;01;02;03;04;05)]<br />
 <br />
@@ -34,24 +57,14 @@ $hHash[
 	$.b[2]
 ]
 
-$dZero(0.0)
-^$dZero(0.0)<br />
-$dOne(1.1)
-^$dOne(1.1)<br />
-$dTwo(2.2)
-^$dTwo(2.2)<br /><br />
+^$fFile[^^file::load[text;152.html]]<br />
+$fFile[^file::load[text;152.html]]
 
-$iZero(^dZero.int[])
-^$iZero(^^dZero.int[])<br />
-$iOne(^dOne.int[])
-^$iOne(^^dOne.int[])<br />
-$iTwo(^dTwo.int[])
-^$iTwo(^^dTwo.int[])<br /><br />
+^$fStat[^^file::stat[152.html]]<br /><br />
+$fStat[^file::stat[152.html]]
 
-$bTrue(1==1)
-^$bTrue(1==1)<br />
-$bFalse(1==0)
-^$bFalse(1==0)<br /><br />
+^$fImage[^^image::measure[103paf2001.gif]]<br /><br />
+$fImage[^image::measure[103paf2001.gif]]
 
 $xDoc[^xdoc::create{<?xml version="1.0"?><root><t/><t/><t/></root>}]
 ^$xDoc[^^xdoc::create{<?xml version="1.0"?><root><t/><t/><t/></root>}]<br />
@@ -61,37 +74,48 @@ $xDoc[^xdoc::create{<?xml version="1.0"?
 $h[^xDoc.select[/root/t]]
 $xNode[$h.0]
 
-<h2>.CLASS_NAME</h2>
-^$bTrue.CLASS_NAME: $bTrue.CLASS_NAME<br />
-^$bFalse.CLASS_NAME: $bFalse.CLASS_NAME<br />
-<br />
+<hr />
+<table border="1">
+^printHeadLine[<br />]
+^printLine[^$vVoid;$vVoid.CLASS_NAME;^checkDef[];^checkExp[$vVoid]]
 
-^$sEmpty.CLASS_NAME: $sEmpty.CLASS_NAME<br />
-^$sZero.CLASS_NAME: $sZero.CLASS_NAME<br />
-^$sOne.CLASS_NAME: $sOne.CLASS_NAME<br />
-^$sTwo.CLASS_NAME: $sTwo.CLASS_NAME<br />
-<br />
+^printLine[^$bFalse;$bFalse.CLASS_NAME;^checkDef[$bFalse];^checkExp[$bFalse];$bFalse]
+^printLine[^$bTrue;$bTrue.CLASS_NAME;^checkDef[$bTrue];^checkExp[$bTrue];$bTrue]
 
-^$dZero.CLASS_NAME: $dZero.CLASS_NAME<br />
-^$dOne.CLASS_NAME: $dOne.CLASS_NAME<br />
-^$dTwo.CLASS_NAME: $dTwo.CLASS_NAME<br />
-<br />
+^printLine[^$sEmpty;<b>$sEmpty.CLASS_NAME</b>;^checkDef[$sEmpty];^checkExp[$sEmpty];$sEmpty]
+^printLine[^$sZero;$sZero.CLASS_NAME;^checkDef[$sZero];^checkExp[$sZero];$sZero]
+^printLine[^$sOne;$sOne.CLASS_NAME;^checkDef[$sOne];^checkExp[$sOne];$sOne]
+^printLine[^$sTwo;$sTwo.CLASS_NAME;^checkDef[$sTwo];^checkExp[$sTwo];$sTwo]
+
+^printLine[^$dZero;$dZero.CLASS_NAME;^checkDef($dZero);^checkExp($dZero)]($dZero)
+^printLine[^$dOne;$dOne.CLASS_NAME;^checkDef($dOne);^checkExp($dOne)]($dOne)
+^printLine[^$dTwo;$dTwo.CLASS_NAME;^checkDef($dTwo);^checkExp($dTwo)]($dTwo)
+
+^printLine[^$iZero;$iZero.CLASS_NAME;^checkDef($iZero);^checkExp($iZero)]($iZero)
+^printLine[^$iOne;$iOne.CLASS_NAME;^checkDef($iOne);^checkExp($iOne)]($iOne)
+^printLine[^$iTwo;$iTwo.CLASS_NAME;^checkDef($iTwo);^checkExp($iTwo)]($iTwo)
+
+^printLine[^$tEmptyTable;$tEmptyTable.CLASS_NAME;^checkDef[$tEmptyTable];^checkExp[$tEmptyTable];$tEmptyTable]
+^printLine[^$tTable;$tTable.CLASS_NAME;^checkDef[$tTable];^checkExp[$tTable];$tTable]
+
+^printLine[^$hEmptyHash;$hEmptyHash.CLASS_NAME;^checkDef[$hEmptyHash];^checkExp[$hEmptyHash];$hEmptyHash]
+^printLine[^$hHash;$hHash.CLASS_NAME;^checkDef[$hHash];^checkExp[$hHash];$hHash]
+
+^printLine[^$fFile;$fFile.CLASS_NAME;^checkDef[$fFile];^checkExp[$fFile];$fFile]
+^printLine[^$fStat;$fStat.CLASS_NAME;^checkDef[$fStat];^checkExp[$fStat];$fStat]
+^printLine[^$fImage;$fImage.CLASS_NAME;^checkDef[$fImage];^checkExp[$fImage];$fImage]
+
+^printLine[^$dtDate;$dtDate.CLASS_NAME;^checkDef[$dtDate];^checkExp[$dtDate];$dtDate]
+^printLine[^$xDoc;$xDoc.CLASS_NAME;^checkDef[$xDoc];^checkExp[$xDoc];$xDoc]
+^printLine[^$xNode;$xNode.CLASS_NAME;^checkDef[$xNode];^checkExp[$xNode];$xNode]
+</table>
 
-^$iZero.CLASS_NAME: $iZero.CLASS_NAME<br />
-^$iOne.CLASS_NAME: $iOne.CLASS_NAME<br />
-^$iTwo.CLASS_NAME: $iTwo.CLASS_NAME<br />
-<br />
 
-^$tTable.CLASS_NAME: $tTable.CLASS_NAME<br />
-^$hHash.CLASS_NAME: $hHash.CLASS_NAME<br />
-^$dtDate.CLASS_NAME: $dtDate.CLASS_NAME<br />
-^$xDoc.CLASS_NAME: $xDoc.CLASS_NAME<br />
-^$xNode.CLASS_NAME: $xNode.CLASS_NAME<br />
 
 <h2>bool itself</h2>
 (1==0): ^checkBool(1==0)
 (1==1): ^checkBool(1==1)
-<br />
+
 
 <h2>bool methods for void</h2>
 ^^vVoid.bool(true): ^checkBool(^vVoid.bool(true))
@@ -111,6 +135,12 @@ $xNode[$h.0]
 ^^sTwo.bool(true): ^checkBool(^sTwo.bool(true))
 ^^sTwo.bool(false): ^checkBool(^sTwo.bool(false))
 
+^^sTrue.bool(true): ^checkBool(^sTrue.bool(true))
+^^sTrue.bool(false): ^checkBool(^sTrue.bool(false))
+
+^^sFalse.bool(true): ^checkBool(^sFalse.bool(true))
+^^sFalse.bool(false): ^checkBool(^sFalse.bool(false))
+
 
 <h2>bool methods for double</h2>
 ^^dZero.bool(true): ^checkBool(^dZero.bool(true))
@@ -134,40 +164,6 @@ $xNode[$h.0]
 ^^iTwo.bool(false): ^checkBool(^iTwo.bool(false))
 
 
-<h2>others</h2>
-<table border="1">
-^printHeadLine[<br />]
-^printLine[^$vVoid;^checkDef[];^checkExp[$vVoid]]
-
-^printLine[^$bFalse;^checkDef[$bFalse];^checkExp[$bFalse];$bFalse]
-^printLine[^$bTrue;^checkDef[$bTrue];^checkExp[$bTrue];$bTrue]
-
-^printLine[^$sEmpty;^checkDef[$sEmpty];^checkExp[$sEmpty];$sEmpty]
-^printLine[^$sZero;^checkDef[$sZero];^checkExp[$sZero];$sZero]
-^printLine[^$sOne;^checkDef[$sOne];^checkExp[$sOne];$sOne]
-^printLine[^$sTwo;^checkDef[$sTwo];^checkExp[$sTwo];$sTwo]
-
-^printLine[^$dZero;^checkDef($dZero);^checkExp($dZero)]($dZero)
-^printLine[^$dOne;^checkDef($dOne);^checkExp($dOne)]($dOne)
-^printLine[^$dTwo;^checkDef($dTwo);^checkExp($dTwo)]($dTwo)
-
-^printLine[^$iZero;^checkDef($iZero);^checkExp($iZero)]($iZero)
-^printLine[^$iOne;^checkDef($iOne);^checkExp($iOne)]($iOne)
-^printLine[^$iTwo;^checkDef($iTwo);^checkExp($iTwo)]($iTwo)
-
-^printLine[^$tEmptyTable;^checkDef[$tEmptyTable];^checkExp[$tEmptyTable];$tEmptyTable]
-^printLine[^$tTable;^checkDef[$tTable];^checkExp[$tTable];$tTable]
-
-^printLine[^$hEmptyHash;^checkDef[$hEmptyHash];^checkExp[$hEmptyHash];$hEmptyHash]
-^printLine[^$hHash;^checkDef[$hHash];^checkExp[$hHash];$hHash]
-
-^printLine[^$dtDate;^checkDef[$dtDate];^checkExp[$dtDate];$dtDate]
-^printLine[^$xDoc;^checkDef[$xDoc];^checkExp[$xDoc];$xDoc]
-^printLine[^$xNode;^checkDef[$xNode];^checkExp[$xNode];$xNode]
-</table>
-
-
-
 @checkIsBool[uValue]
 ^if($uValue is "bool"){yes}{no}<br />
 
@@ -177,11 +173,11 @@ $xNode[$h.0]
 
 
 @checkDef[uValue]
-^if(def $uValue){yes}{no}<br />
+^if(def $uValue){<b>yes</b>}{no}<br />
 
 
 @checkExp[uValue]
-^if($uValue){true}{false}<br />
+^if($uValue){<b>true</b>}{false}<br />
 
 
 @printHeadLine[sTitle]
@@ -192,21 +188,25 @@ double
 int
 table
 hash
+file
+image
 date
 xdoc
 xnode
 }]
 <tr>
 	<td>$sTitle</td>
+	<td>.CLASS_NAME</td>
 	<td>(def ...)</td>
 	<td>(...)</td>
-	^tType.menu{<td>(... is $tType.sName)</td>}
+	^tType.menu{<td>is $tType.sName</td>}
 </tr>
 
 
-@printLine[sTitle;sDef;sExp;uValue]
+@printLine[sTitle;sClassName;sDef;sExp;uValue]
 <tr>
 	<td>$sTitle</td>
+	<td>$sClassName</td>
 	<td>$sDef</td>
 	<td>$sExp</td>
 	^tType.menu{