--- loncom/homework/CAPA-converter/capaLexerDef.flex	2000/07/06 21:06:22	1.4
+++ loncom/homework/CAPA-converter/capaLexerDef.flex	2000/10/25 20:26:57	1.5
@@ -699,7 +699,7 @@ EndLine    ([\r][\n]|[\n])
 }
 
 <S_IMPORT>{
-{FileName}{Space}*             { end_mode();send("<import>%s</import>\n",yytext); BEGIN S_SKIP; }
+{FileName}{Space}*             { end_mode();send("<import>/res/capa/%s</import>\n",yytext); BEGIN S_SKIP; }
 {Identifier}{Space}*           { end_mode();send("<import>$%s</import>\n",yytext);  BEGIN S_SKIP; }
 }
 
@@ -996,12 +996,12 @@ EndLine    ([\r][\n]|[\n])
 }
 
 <S_MAP>{
-[;,]                         { LLDBUG_PR2("[%c]",yytext[0]); return(yytext[0]);  }
+[;,]                         { LLDBUG_PR2("[%c]",yytext[0]); send("%c",yytext[0]);  }
 [\)]                         { LLDBUG_PR1("[) in MAP]"); Pcount--; 
                                if(Pcount==0) {
                                    BEGIN S_SKIP; 
                                }
-                               return(yytext[0]); 
+                               send("%c",yytext[0]); 
                              }
 }