--- loncom/homework/CAPA-converter/capaLexerDef.flex	2001/11/15 21:42:42	1.9
+++ loncom/homework/CAPA-converter/capaLexerDef.flex	2001/11/18 09:49:43	1.10
@@ -119,8 +119,6 @@ Symbol       *FmlSymbLast_p;
 int           FmlSymb_cnt;
 int           Symb_count;
 
-int           IFstatus[MAX_FUNC_NEST];     /* <-- perhaps we can use linked list */
-int           IFcurrent[MAX_FUNC_NEST];    /* <-- perhaps we can use linked list */
 int           IFcount;
 WhileLoop_t   WhileStack[MAX_FUNC_NEST];   /* <-- perhaps we can use linked list */
 int           While_idx, Wcount;
@@ -362,7 +360,7 @@ EndLine    ([\r][\n]|[\n])
 %n 1000
 %x  S_COMMENT   S_HINT S_HINTEXLAINX  S_IMPORT S_EXPLAIN S_ENDX    S_UNIT   S_IGNORE  
 %x  S_SKIP      S_VARIABLE S_LET  S_DEFINE     S_TEXT    S_MAP     S_FIGURE S_ANSWER 
-%x  S_STRING    S_ANSCONTINUE     S_TRUE_FALSE_STMT      S_IF_SKIP S_WHILE_SKIP
+%x  S_STRING    S_ANSCONTINUE     S_TRUE_FALSE_STMT      S_WHILE_SKIP
 %x  S_NEXT_LINE S_VERB   S_ECHO S_STRINGINANS
 %array
 
@@ -444,8 +442,9 @@ EndLine    ([\r][\n]|[\n])
                                 Pcount = 0; 
                                 BEGIN S_ANSWER;
                                 end_mode();
+				start_mode(MODE_ANSWER,NULL);
                                 send("<capasubjectiveresponse");
-				dosend=1;    
+				dosend=1; 
 				firstparam=1;                            
                               }
 ^{Spaces}"/MAP"               { LLDBUG_PRL1("[MAP]");  Pcount = 0; sccount = 0; BEGIN S_MAP; start_mode(MODE_SCRIPT,NULL);send("&map("); }
@@ -485,18 +484,48 @@ EndLine    ([\r][\n]|[\n])
                                 BEGIN S_TRUE_FALSE_STMT; RETURN(CAPA_WHILE); 
                                 
                               }
-^{Spaces}"/IF"                { IFcount++; IFcurrent[IFcount] = RUN_IF_PORTION;
-                                LLDBUG_PRL2("[IF <IFcount=%d>]",IFcount);  BEGIN S_TRUE_FALSE_STMT; RETURN(CAPA_IF); }
-^{Spaces}"/ELSE"([^\n])*        { LLDBUG_PRL2("[ELSE <IFcount=%d>]\n",IFcount); 
-                                IFcurrent[IFcount] = RUN_ELSE_PORTION;
-                                if( IFstatus[IFcount] == IF_TRUE ) {
-                                  LLDBUG_PRL1("[ELSE begin Skip]\n");
-                                  BEGIN S_IF_SKIP;
-                                }
-                              }
-^{Spaces}"/ENDIF"([^\n])*    { IFcount--; LLDBUG_PRL2("[ENDIF <IFcount=%d>]\n",IFcount); 
+^{Spaces}"/IF"                { int i;
+				IFcount++;
+                                LLDBUG_PRL2("[IF <IFcount=%d>]",IFcount);
+				BEGIN S_TRUE_FALSE_STMT;
+				if ( IFcount == 1) {
+ 				  start_streams(2);
+				  watch_mode[1]=1;
+				}
+				end_mode_stream(0);
+				start_mode_stream(1,MODE_SCRIPT,NULL);
+				for(i=1;i<IFcount;i++) {send("\t",NULL);}
+				send_stream(0,"<block condition=\"",NULL);
+				send_stream(1,"if (",NULL);
+				new_cache();
+				start_cache();
+			       }
+^{Spaces}"/ELSE"([^\n])*      { int i;
+				LLDBUG_PRL2("[ELSE <IFcount=%d>]\n",IFcount);
+				end_mode_stream(0);
+				for(i=1;i<IFcount;i++) {send("\t",NULL);}
+ 				send_stream(0,
+                                      "</block>\n<block condition=\"!(%s)\">",
+				      cached_data[current_cache].str);
+				send_stream(1,"} else {");
+                              }
+^{Spaces}"/ENDIF"([^\n])*     { int i;
+				IFcount--;
+				end_mode_stream(0);
+				for(i=0;i<IFcount;i++) {send("\t",NULL);}
+				send_stream(0,"</block>");
+				send_stream(1,"}");
+				if (IFcount == 0) {
+				  if (watch_mode[1]) {
+				    end_streams(1);
+ 				  } else {
+				    end_streams(0);
+				  }
+				}
+				delete_cache();
+				LLDBUG_PRL2("[ENDIF <IFcount=%d>]\n",IFcount); 
                               }
-"/AND"                        { LLDBUG_PRL1("[AND]"); BEGIN S_ANSCONTINUE; RETURN(ANS_AND); }
+"/AND"                        { LLDBUG_PRL1("[AND]"); /*implict in LON-CAPA*/}
 "/DIS"                        { /* since S_VARIABLE treat {Space} as null, so here we do not match ( */
                                 /* so that between /DIS and ( can have as many {Space} as we want */
                                 LLDBUG_PR1("[DIS<]");
@@ -629,8 +658,6 @@ EndLine    ([\r][\n]|[\n])
 <S_HINT,S_EXPLAIN>{
 [/][Dd][Ii][Ss]{Space}*[\(]{Space}*  {  yy_push_state(S_HINTEXLAINX); }
 [^/\n]+[/\\]                    { char  *aptr = yytext;
-                                  int    ii;
-                                
                                   yyless(yyleng-1);
 				  send(aptr);
                                 }
@@ -638,8 +665,7 @@ EndLine    ([\r][\n]|[\n])
 [\\]                           { send("\\"); }
 [\\]{Space}*[\n]               { LLDBUG_PR1("[\\CR hint explain continue]"); /* Hint and explain continuation */ }
 [^/\n\\]+$                     {char  *aptr = yytext;
-                                int    ii;
-				send(aptr);
+                                send(aptr);
                                }
 }
 <S_HINT>{
@@ -662,8 +688,19 @@ EndLine    ([\r][\n]|[\n])
 }
 
 <S_IMPORT>{
-{FileName}{Space}*             { end_mode();send("<import>/res/ohiou/%s</import>\n",yytext); BEGIN S_SKIP; }
-{Identifier}{Space}*           { end_mode();send("<import>$%s</import>\n",yytext);  BEGIN S_SKIP; }
+{FileName}{Space}*             {
+                                 end_mode();
+				 start_mode(MODE_IMPORT,NULL);
+                                 send("%s/%s",import_prefix,yytext);
+			         end_mode();
+                                 BEGIN S_SKIP; 
+                               }
+{Identifier}{Space}*           { end_mode();
+				 start_mode(MODE_IMPORT,NULL);
+				 send("$%s",yytext);
+				 end_mode();
+				 BEGIN S_SKIP;
+			       }
 }
 
 <S_ANSWER>{
@@ -685,7 +722,7 @@ EndLine    ([\r][\n]|[\n])
 [,=]                  { LLDBUG_PR2("[symbol(%s)]",yytext);}
 [%]                  { LLDBUG_PR2("[symbol(%s)]",yytext); 
                        if (dosend==1) send("%s",yytext);
-                       if (dosend==2) add_delayed("%s",yytext);
+                       if (dosend==2) add_delayed("%%%s",yytext);
                      }
 [:@#-]                  { LLDBUG_PR2("[symbol(%s)]",yytext); 
                           if (dosend==1) send("%s",yytext);
@@ -701,18 +738,30 @@ EndLine    ([\r][\n]|[\n])
                              }
 
 [Pp][Cc][Rr]                 |
-[Hh][Gg][Rr]                 { if (firstparam) firstparam=0; else add_delayed("\" />\n\t");
+[Hh][Gg][Rr]                 { if (firstparam) {
+				firstparam=0; 
+			       } else {
+				add_delayed("\" />\n\t");
+			       }
                                add_delayed("<responseparam name=\"hgr\" type=\"on|off\" default=\""); 
                                dosend=2;
                              }
 [Tt][Oo][Ll]                 { LLDBUG_PR2("[tol(%s)]",yytext);
-                               if (firstparam) firstparam=0; else add_delayed("\" />\n\t");
+                               if (firstparam) {
+				 firstparam=0; 
+			       } else {
+				 add_delayed("\" />\n\t");
+			       }
 			       add_delayed("<responseparam name=\"tol\" type=\"tolerance\" description=\"Numerical Tolerance\" default=\""); 
                                dosend=2;
                              }
 [Ss][Ii][Gg]                 { 
                                LLDBUG_PR2("[SIG(%s)]",yytext); 
-                               if (firstparam) firstparam=0; else add_delayed("\" />\n\t");
+                               if (firstparam) {
+				 firstparam=0; 
+			       } else {
+				 add_delayed("\" />\n\t");
+			       }
 			       add_delayed("<responseparam name=\"sig\" type=\"int,range,0-12\" description=\"Significant Figures\" default=\""); 
                                dosend=2;
                              }
@@ -743,8 +792,8 @@ EndLine    ([\r][\n]|[\n])
                                send("\">\n\t");
 			       dosend=1;
 			       flush_delayed();
-			       if (!firstparam) send("\" />");
-			       send("\n\t<textline />\n</numericalresponse>\n");
+			       if (firstparam!=1) send("\" />\n");
+			       send("\t<textline />\n</numericalresponse>\n");
                              }
 }
 
@@ -813,7 +862,7 @@ EndLine    ([\r][\n]|[\n])
 }
 
 <S_VARIABLE,S_TRUE_FALSE_STMT,S_MAP,S_ANSWER>{
-[\(]                      { LLDBUG_PR1("[dis let ans map (]"); 
+[\(]                      { LLDBUG_PR1("[let if ans map (]"); 
                             Pcount++; 
 			    if (Pcount > 1 ) {
 			      if (dosend==1) send(yytext);
@@ -823,7 +872,7 @@ EndLine    ([\r][\n]|[\n])
 }
 
 <S_LET>{
-[\(]                      { LLDBUG_PR1("[dis let ans map (]"); 
+[\(]                      { LLDBUG_PR1("[let (]"); 
                             Pcount++; 
 			    send(yytext);
                           }
@@ -905,10 +954,24 @@ EndLine    ([\r][\n]|[\n])
 }
 
 <S_TRUE_FALSE_STMT>{
-[\)]                     { LLDBUG_PRL1("[) in TRUE_FALSE]"); Pcount--; if(Pcount == 0)  BEGIN S_NEXT_LINE; return(yytext[0]); }
-[\\]{Space}*{EndLine}    { LLDBUG_PR2("[\\EoL continue in S_TRUE_FALSE_STMT](%s)",yytext); /* continuation on next line */ }                       
-{EndLine}                { LLDBUG_PR1("[EoL within /IF()]\n"); RETURN(EoL); }
-.                   { char warn_msg[WARN_MSG_LENGTH]; 
+[\)]                     { 
+                           LLDBUG_PRL1("[) in TRUE_FALSE]");
+			   Pcount--; 
+			   if(Pcount == 0)  {
+				stop_cache();
+				send_stream(0,"\">\n");
+				send_stream(1,") {\n");
+				BEGIN S_NEXT_LINE;
+			   }
+			 }
+[\\]{Space}*{EndLine}    { 
+			   LLDBUG_PR2("[\\EoL continue in S_TRUE_FALSE_STMT](%s)",yytext); /* continuation on next line */ 
+			 }                       
+{EndLine}                { 
+			   LLDBUG_PR1("[EoL within /IF()]\n"); RETURN(EoL);
+			 }
+.                   { 
+		      char warn_msg[WARN_MSG_LENGTH]; 
                       sprintf(warn_msg,"In /IF(), an unexpected char [%c] is encountered.\n",yytext[0]);
                       capa_msg(MESSAGE_ERROR,warn_msg);
                     }
@@ -991,41 +1054,10 @@ EndLine    ([\r][\n]|[\n])
 [\\]{Space}*{EndLine}    { /* continuation */ }
 {EndLine}                { /* end of answer and/or other answers */ LLDBUG_PR1("[complete an answer<EoL>]"); 
                            BEGIN S_TEXT; }
-"/AND"                   { LLDBUG_PR1("[AND]"); RETURN(ANS_AND); }
+"/AND"                   { LLDBUG_PR1("[AND]"); /* implicit in LON-CAPA */ }
 "/OR"                    { LLDBUG_PR1("[OR]");  RETURN(ANS_OR);  }
 }
 
-<S_IF_SKIP>{
-^{Spaces}"/IF"[^\n]*{EndLine}    { IFcount++; LLDBUG_PRL2("[Skip IF <IFcount=%d>]\n",IFcount); 
-                                   IFstatus[IFcount] = IF_DONT_CARE;
-                                 }
-^{Spaces}"/ELSE"[^\n]*{EndLine}  {  LLDBUG_PRL2("[Skip ELSE <IFcount=%d>]",IFcount);
-                            IFcurrent[IFcount]=RUN_ELSE_PORTION; 
-                            if( IFstatus[IFcount] == IF_FALSE ) {
-                               LLDBUG_PRL1("[ELSE begin TEXT CR]\n");
-                               BEGIN S_TEXT;
-                            } 
-                            if( IFstatus[IFcount] == IF_TRUE ) {
-                               LLDBUG_PRL1("[ELSE THIS SHOULD NEVER HAPPEN.]\n");
-                            }
-                         }
-^{Spaces}"/ENDIF"[^\n]*{EndLine} { IFcount--; LLDBUG_PRL2("[Skip ENDIF <IFcount=%d>]\n",IFcount);
-                            if( IFcount == 0 ) {
-                               LLDBUG_PRL1("[ENDIF begin TEXT CR]\n");
-                               BEGIN S_TEXT;
-                            }
-                            if( (IFcurrent[IFcount] == RUN_IF_PORTION )&&(IFstatus[IFcount] == IF_TRUE)) {
-                               LLDBUG_PRL1("[ENDIF begin TEXT CR]\n");
-                               BEGIN S_TEXT;
-                            }
-                            if( (IFcurrent[IFcount] == RUN_ELSE_PORTION )&&(IFstatus[IFcount] == IF_FALSE)) {
-                               LLDBUG_PRL1("[ENDIF begin TEXT CR]\n");
-                               BEGIN S_TEXT;
-                            }
-                         }
-{EndLine}                { LLDBUG_PRL1("[SkipIF a CR]\n");       }
-[^\n]*$                  { LLDBUG_PRL2("[SkipIF anything <IFcount=%d>]",IFcount);   }
-}
 <S_NEXT_LINE>{
 ([.]*){EndLine}          { /* this ignores everything until it hits an EoL */
                            LLDBUG_PRL2("[<S_NEXT_LINE> skip \'%s\' until EoL]\n",yytext); 
@@ -1062,8 +1094,6 @@ EndLine    ([\r][\n]|[\n])
 %%
 
 /* ========================================================================================== */
-extern void
-begin_if_skip() { BEGIN S_IF_SKIP; }
 
 extern void
 begin_while_skip() { Wcount=0; While_idx--; /* while is FALSE, pop it out from stack */ BEGIN S_WHILE_SKIP; }