[Aimmath-commit] AIM/WEB-INF/maple Aim.mpl,1.1.1.1.2.1,1.1.1.1.2.2 Make.mpl,1.1.1.1.2.1,1.1.1.1.2.2

[<gr...@us...>]

Update of /cvsroot/aimmath/AIM/WEB-INF/maple
In directory sc8-pr-cvs1:/tmp/cvs-serv29933

Modified Files:
      Tag: develop_2_1
	Aim.mpl Make.mpl 
Log Message:
Allow PackageList to have comments and whitespace.                     - GG


Index: Aim.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Aim.mpl,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -d -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Aim.mpl	8 Jul 2003 06:21:33 -0000	1.1.1.1.2.1
--- Aim.mpl	9 Jul 2003 09:41:33 -0000	1.1.1.1.2.2
***************
*** 17,22 ****
  
  while (line <> 0) do
   if line <> "" then
-   line := util_unixify(line);
    lines := lines,line:
   fi;
--- 17,25 ----
  
  while (line <> 0) do
+  # remove comment (possibly preceded by whitespace) or
+  # whitespace at end of line from line
+  line := StringTools:-RegSub("^([^ \t#]*)([ \t]*#.*|[ \t]*.*$)?", line, "\\1");
+  line := util_unixify(line);
   if line <> "" then
    lines := lines,line:
   fi;

Index: Make.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Make.mpl,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -C2 -d -r1.1.1.1.2.1 -r1.1.1.1.2.2
*** Make.mpl	8 Jul 2003 06:21:33 -0000	1.1.1.1.2.1
--- Make.mpl	9 Jul 2003 09:41:33 -0000	1.1.1.1.2.2
***************
*** 97,100 ****
--- 97,103 ----
  Make_ok := true;
  while (line <> 0) do
+  # remove comment (possibly preceded by whitespace) or
+  # whitespace at end of line from line
+  line := StringTools:-RegSub("^([^ \t#]*)([ \t]*#.*|[ \t]*.*$)?", line, "\\1");
   line := util_unixify(line);
   if line <> "" then