[LON-CAPA-cvs] cvs: loncom /homework response.pm

[albertel]

albertel		Fri Aug 10 17:27:56 2007 EDT

  Modified files:              
    /loncom/homework	response.pm 
  Log:
  - correcting the reg expression to fill in all * needed
  
  
Index: loncom/homework/response.pm
diff -u loncom/homework/response.pm:1.174 loncom/homework/response.pm:1.175
--- loncom/homework/response.pm:1.174	Fri Aug 10 14:16:28 2007
+++ loncom/homework/response.pm	Fri Aug 10 17:27:56 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.174 2007/08/10 18:16:28 riegler Exp $
+# $Id: response.pm,v 1.175 2007/08/10 21:27:56 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -569,8 +569,7 @@
     $expression=~s/(\d+)(?:x|\*)10(?:\^|\*\*)([\+\-]*\d+)/$1\&\($2\)/gsi;
 # Fill in multiplication signs
 # a b -> a*b;3 b -> 3*b;3 4 -> 3*4
-# The while-pos-construction is necessary for a b c -> a*b*c*d instead of a*b c*d
-    while($expression=~s/([A-Za-z0-9])\s+([A-Za-z0-9])/$1\*$2/gs){pos($expression)--}
+    $expr=~s/([A-Za-z0-9])\s+(?=[A-Za-z0-9])/$1\*/gs;
 # )( -> )*(; ) ( -> )*(
     $expression=~s/\)\s*\(/\)\*\(/gs;
 # 3a -> 3*a; 3( -> 3*(; 3 ( -> 3*(; 3A -> 3*A