--- loncom/homework/CAPA-converter/capaLexerDef.flex	2000/04/12 20:06:16	1.1
+++ loncom/homework/CAPA-converter/capaLexerDef.flex	2000/05/03 15:35:11	1.2
@@ -140,6 +140,7 @@ extern        Problem_t         *LexiPro
 extern        Problem_t         *LastProblem_p;
 int           first_run=1;
 int           Stop_Parser;
+int           scriptopen=0;
 #define  FLEX
 
 #define  YY_STACK_USED   1  /* for yy_push_state(), yy_pop_state() */
@@ -378,17 +379,19 @@ EndLine    ([\r][\n]|[\n])
 }
 
 <S_COMMENT>{
-^{Spaces}"//"[^\n]*$		      { LLDBUG_PRL2("[COMMENT<%s>]\n",yytext);
-                                        send(&yytext[2]);
-					send("\n");
-                                        BEGIN S_COMMENT; 
-                                      }
-.      { send("</comment>\n"); BEGIN S_TEXT; }
+{EndLine}{Spaces}"//"[^\n]*$ {LLDBUG_PRL2("[COMMENT<%s>]\n",yytext);
+                              remove_delayed(); 
+			      send("%s",yytext);
+			      send_delayed("\n</comment>\n");
+                             }
+[^\n]*{EndLine}      BEGIN S_TEXT;
 }
 
+
 <S_TEXT>{
 ^{Spaces}"/LET" |
-^{Spaces}"/BEG"                  { LLDBUG_PRL1("[LET]"); Pcount = 0; init_funcstack(); BEGIN S_LET; RETURN(CAPA_LET); }
+	   ^{Spaces}"/BEG"                  { LLDBUG_PRL1("[LET]"); Pcount = 0; BEGIN S_LET; if (!scriptopen){send("<script>\n");scriptopen=1;}
+}
 ^{Spaces}"/VERB"                 { 
                                    LLDBUG_PRL1("[VERBATIM]");
 				   Dynamic_buf = (char *)capa_malloc(sizeof(char),10);
@@ -397,7 +400,10 @@ EndLine    ([\r][\n]|[\n])
 				   Dynamic_buf[0] = '\0';
                                    BEGIN S_VERB; 
                                  }
-^{Spaces}"/HIN"{Alpha}*{Spaces}  { LLDBUG_PRL1("[HIN]"); Current_char_p = String_buf;  BEGIN S_HINT; }
+^{Spaces}"/HIN"{Alpha}*{Spaces}  { LLDBUG_PRL1("[HIN]"); 
+                                   send("<block condition=\"&hinton\">\n");
+				   BEGIN S_HINT; 
+                                 }
 ^{Spaces}"/EXP"{Alpha}*{Spaces}  { LLDBUG_PRL1("[EXP]"); Current_char_p = String_buf;  BEGIN S_EXPLAIN; }
 ^{Spaces}"/IMP"{Alpha}*{Space}+  { LLDBUG_PRL1("[IMP]"); BEGIN S_IMPORT; }
 ^{Spaces}"/END"                  { LLDBUG_PRL1("[END]");  
@@ -486,28 +492,27 @@ EndLine    ([\r][\n]|[\n])
 {EndLine}                     { LLDBUG_PR1("[EoL within S_TEXT]\n"); /* end of the whole text line */ 
                                 RETURN(EoL); }
 [\\]{Space}*{EndLine}         { LLDBUG_PR2("[\\EoL continue](%s)",yytext); /* continuation on next line */ }                       
-^{Spaces}"//"[^\n]*{EndLine}		      { LLDBUG_PRL2("[COMMENT<%s>]\n",yytext);
-                                        send("<comment>\n");
-                                        send(&yytext[2]);
-                                        BEGIN S_COMMENT; 
+^{Spaces}"//"[^\n]*$		      { LLDBUG_PRL2("[COMMENT<%s>]\n",yytext);
+                                        remove_delayed(); 
+                                        send("<comment>\n%s\n",yytext);
+					send_delayed("</comment>\n");
+					BEGIN S_COMMENT;
                                       }
+
 [^/\n\\]+$  |
 [/]         | 
 [\\]                          {  yylval = (Symbol *) capa_malloc(1, sizeof(Symbol));
                                 yylval->s_str = strsave(yytext);
                                 LLDBUG_PR2("[TEXT_LINE<%s>]",yytext);
-			        RETURN(TEXT_LINE); 
+			        //RETURN(TEXT_LINE); 
 			      }
 ([^/\n])+[/] |
 ([^/\n])+[\\]                 { /* matches anything until a '/' or a '\' */
                                 LLDBUG_PR2("[TEXT_LINE( )<%s>]",yytext);
                                 
                                 yyless(yyleng-1); /* push back the last char */
-                                yylval = (Symbol *) capa_malloc(1, sizeof(Symbol));
-                                yylval->s_str = strsave(yytext);
-                                
                                 BEGIN S_TEXT;
-                                RETURN(TEXT_LINE); 
+				send(yytext);
                               }
 <<EOF>>                       { 
 #ifdef AVOIDYYINPUT
@@ -612,27 +617,20 @@ EndLine    ([\r][\n]|[\n])
                                   int    ii;
                                 
                                   yyless(yyleng-1);
-                                  for(ii=0;ii<yyleng;ii++) {
-                                  *Current_char_p++ = *aptr++;
+				  send(aptr);
                                 }
-                                
-                              }
-[/]                            { *Current_char_p++ = '/'; }
-[\\]                           { *Current_char_p++ = '\\'; }
+[/]                            { send("/"); }
+[\\]                           { send("\\"); }
 [\\]{Space}*[\n]               { LLDBUG_PR1("[\\CR hint explain continue]"); /* Hint and explain continuation */ }
-[^/\n\\]+$                      { char  *aptr = yytext;
+[^/\n\\]+$                     {char  *aptr = yytext;
                                 int    ii;
-                                for(ii=0;ii<yyleng;ii++) {
-                                  *Current_char_p++ = *aptr++;
-                                }
-                              }
+				send(aptr);
+                               }
 }
 <S_HINT>{
 {EndLine}                     {  LLDBUG_PR1("[CR hint]");
-                                 yylval = (Symbol *) capa_malloc(1, sizeof(Symbol));
-		                *Current_char_p++ = '\n'; *Current_char_p = '\0';
-	                         yylval->s_str = strsave(String_buf);
-                                 BEGIN S_TEXT; RETURN(HINT_LINE); 
+                                 send("\n</block>\n"); 
+                                 BEGIN S_TEXT;
                               }
 }
 <S_EXPLAIN>{
@@ -681,14 +679,15 @@ EndLine    ([\r][\n]|[\n])
                                          }
                                        break;
                                 }
+				printf("FIXME!Hint: %s\n",yytext);
                               }
 {Space}+                      { }
 [)]                           {  yy_pop_state(); }
 }
 
 <S_IMPORT>{
-{FileName}{Space}*             { parse_filename(yytext);    BEGIN S_SKIP; }
-{Identifier}{Space}*           { parse_import_id(yytext);   BEGIN S_SKIP; }
+{FileName}{Space}*             { send("<import>%s</import>\n",yytext); BEGIN S_SKIP; }
+{Identifier}{Space}*           { send("<import>$%s</import>\n",yytext);  BEGIN S_SKIP; }
 }
 
 <S_ANSWER>{
@@ -737,23 +736,13 @@ EndLine    ([\r][\n]|[\n])
 
 <S_VARIABLE,S_TRUE_FALSE_STMT,S_LET,S_ANSWER,S_MAP>{
 {Alpha}{AlphaNum}*             { LLDBUG_PR2("[ID<%s>]",yytext);LLDBUG_PR2("[SYMB CNT=<%d>]", Symb_count); 
-                                 /*yylval = find_identifier(yytext);*/ RETURN(IDENTIFIER); 
+send("$%s",yytext); 
                                }
 
 {Alpha}{AlphaNum}*{Space}*[(]  { char aline[MAX_FUNC_NAME];
                                  int  i;          
-                                   for(i=0;i < (yyleng-1); i++) {
-                                     if( yytext[i] == ' ' || yytext[i] == '\t' || 
-                                         yytext[i] == 0   || yytext[i] == '(' )    break;
-                                     aline[i] = yytext[i];
-                                   }
-                                   aline[i] = 0;
-                                   LLDBUG_PR3("[FUNCT<%s:%d>]",aline,Func_idx);
-                            (FuncStack[Func_idx]).s_type = FUNCTION_ID;
-			    (FuncStack[Func_idx]).s_name = strsave(aline); /* free it in parser() */
-				   Func_idx++;
-				   yyless(yyleng-1); /* <-- push back '(' char  */
-				   RETURN(FUNCTION_ID); 
+				 send("&%s",yytext);
+				 Pcount++;
                                }
 {Alpha}{AlphaNum}*{Space}*[\[]  {  char aline[MAX_FUNC_NAME];
                                    int  i;   
@@ -779,20 +768,16 @@ EndLine    ([\r][\n]|[\n])
 {Number}+[Ee]{Number}+    |
 {Number}+[Ee]"-"{Number}+ |
 {Number}+"\."{Number}*    |
-"\."{Number}+             {  yylval = (Symbol *) capa_malloc(1, sizeof(Symbol)); /* *** */
-                             yylval->s_real = strtod(yytext, (char **) 0);
-                             yylval->s_type = R_CONSTANT;
+"\."{Number}+             {  
                              LLDBUG_PR2("[REAL<%s>]",yytext);
-                             RETURN(R_CONSTANT);
+			     send(yytext);
 			  }
 
-{Number}+                 {  yylval = (Symbol *) capa_malloc(1, sizeof(Symbol)); /* *** */
-                             yylval->s_int = strtol(yytext, (char **) 0, 0);
-                             yylval->s_type= I_CONSTANT;
+{Number}+                 {  
                              LLDBUG_PR2("[INT<%s>]",yytext);
-                             RETURN(I_CONSTANT);
+                             send(yytext);
 			  }
-[\(]                      { LLDBUG_PR1("[dis let ans map (]"); Pcount++; return(yytext[0]); }
+[\(]                      { LLDBUG_PR1("[dis let ans map (]"); Pcount++; send(yytext); }
 [\[]                      { LLDBUG_PR1("[dis let ans map '[']");         return(yytext[0]); }
 [\]]                      { LLDBUG_PR1("[dis let ans map ']']");         return(yytext[0]); }
 {Space}+                  { /* LLDBUG_PR1("[SP ignored]");  Ignore Spaces */ }
@@ -835,13 +820,13 @@ EndLine    ([\r][\n]|[\n])
 "&&"                { LLDBUG_PR1("[&&]"); RETURN(AND_op); }
 "||"                { LLDBUG_PR1("[||]"); RETURN(OR_op);  }
 "//"                { if(Pcount==0) BEGIN S_SKIP;         }
-{Operator}          { LLDBUG_PR2("[Op(%c) in VAR,TF_STMT,LET]",yytext[0]); return(yytext[0]); }
+{Operator}          { LLDBUG_PR2("[Op(%c) in VAR,TF_STMT,LET]",yytext[0]); send(yytext); }
 }
 
 
 
 <S_VARIABLE>{
-[\)]                     { LLDBUG_PR1("[)]"); Pcount--; if(Pcount == 0)  BEGIN S_TEXT; return(yytext[0]); }
+[\)]                     { LLDBUG_PR1("[)]"); Pcount--; if(Pcount == 0)  BEGIN S_TEXT; send(yytext); }
 [\\]{Space}*{EndLine}    { LLDBUG_PR2("[\\EoL continue in S_VARIABLE (DIS?)](%s)",yytext); /* continuation on next line */ }                       
 {EndLine}                { LLDBUG_PR1("[EoL within /dis()]\n"); RETURN(EoL); }
 .                   { char warn_msg[WARN_MSG_LENGTH]; 
@@ -888,16 +873,16 @@ EndLine    ([\r][\n]|[\n])
                     }
 }
 
-<S_LET>[\)]                  { LLDBUG_PR1("[) in LET]"); Pcount--; return(yytext[0]); }
+<S_LET>[\)]                  { LLDBUG_PR1("[) in LET]"); Pcount--;send(yytext); }
 
 <S_SKIP>{
 [^\n]+$                      {       }
-{EndLine}                    { BEGIN S_TEXT; RETURN(EoL);  }
+{EndLine}                    { BEGIN S_TEXT; }
 }
 
 <S_LET,S_ANSWER,S_MAP>{
 [\\]{Space}*{EndLine}        { LLDBUG_PR1("[\\EoL let ans map]"); /* continuation */ }
-{EndLine}                    { LLDBUG_PR1("[EoL END let ans map]\n"); if(Pcount == 0) BEGIN S_TEXT; RETURN(EoL); }
+{EndLine}                    { LLDBUG_PR1("[EoL END let ans map]\n"); if(Pcount == 0) BEGIN S_TEXT; send(yytext); send_delayed("</script>"); }
 }
 
 <S_MAP>{