work towards a clean compile on migrating set and get variables from Tag.

__if.cpp

@@ -9,7 +9,6 @@ namespace jet {
       coreutils::MString result;
       bool booleanResult = false;
       if(keywordDefined("value1")) {
-	 resolveKeyword("value1");
 	 if(keywordDefined("expr"))
 	   throw coreutils::Exception("Either value1 or expr can be specified but not both.");
 	 if(keywordDefined("value2")) {
@@ -17,15 +16,13 @@ namespace jet {
 	      throw coreutils::Exception("type expected if value1 and value2 specified.");
 	 } else
 	   throw coreutils::Exception("value2 required if value1 specified.");
-	 resolveKeyword("value2");
-	 resolveKeyword("type");
-	 int rc = keywords["value1"].compare(keywords["value2"]);
-	 if(((keywords["type"] == "eq") && (rc == 0)) ||
-	    ((keywords["type"] == "ne") && (rc != 0)) ||
-	    ((keywords["type"] == "lt") && (rc == -1)) || 
-	    ((keywords["type"] == "le") && (rc != 1)) ||
-	    ((keywords["type"] == "gt") && (rc == 1)) ||
-	    ((keywords["type"] == "ge") && (rc != -1)))
+	 int rc = keywords[resolveKeyword("value1")].compare(keywords[resolveKeyword("value2")]);
+	 if(((keywords[resolveKeyword("type")] == "eq") && (rc == 0)) ||
+	    ((keywords[resolveKeyword("type")] == "ne") && (rc != 0)) ||
+	    ((keywords[resolveKeyword("type")] == "lt") && (rc == -1)) || 
+	    ((keywords[resolveKeyword("type")] == "le") && (rc != 1)) ||
+	    ((keywords[resolveKeyword("type")] == "gt") && (rc == 1)) ||
+	    ((keywords[resolveKeyword("type")] == "ge") && (rc != -1)))
 	   booleanResult = true;
 	 else
 	   throw coreutils::Exception("type value must be 'eq','ne','lt','le','gt','ge'.");
@@ -34,7 +31,7 @@ namespace jet {
 	   throw coreutils::Exception("value2 should not be specified with expr.");
 	 if(keywordDefined("type"))
 	   throw coreutils::Exception("type should not be specified with expr.");
-	 booleanResult = Operand(keywords["expr"], global, parent->variables, keywords).boolean;
+	 booleanResult = Operand(keywords["expr"], *this).boolean;
       }
       if(booleanResult) 
 	processContainer(container);