[Aimmath-commit] AIM/WEB-INF/maple FullPackage.mpl,1.3,1.4 OSWin.c,1.2,1.3 Util.mpl,1.4,1.5 Util0.mpl,1.3,1.4

[<nps...@us...>]

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

Modified Files:
	FullPackage.mpl OSWin.c Util.mpl Util0.mpl 
Log Message:


Index: FullPackage.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/FullPackage.mpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FullPackage.mpl	25 Aug 2003 21:47:18 -0000	1.3
--- FullPackage.mpl	10 Oct 2003 09:49:31 -0000	1.4
***************
*** 149,153 ****
  
    if (assigned(`Package/Name`)) then
!    ERROR("Already defining a package");
    fi;
  
--- 149,154 ----
  
    if (assigned(`Package/Name`)) then
!    EndPackage();
! #   ERROR("Already defining a package");
    fi;
  

Index: OSWin.c
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/OSWin.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OSWin.c	25 Aug 2003 21:47:18 -0000	1.2
--- OSWin.c	10 Oct 2003 09:49:31 -0000	1.3
***************
*** 7,10 ****
--- 7,11 ----
  #include <time.h>
  #include <Windows.h>
+ #define _WIN32_WINNT 0x0501
  
  void cookdate(DWORD t,WORD *r)
***************
*** 53,54 ****
--- 54,89 ----
  }
  
+ 
+ /*
+ char **listfiles(char *dir)
+ {
+   WIN32_FIND_DATA FindFileData;
+   HANDLE hFind = NULL;
+   LPCTSTR lpDirSpec[MAXPATH];  // directory specification
+ 
+   strncpy (lpDirSpec, dir, sizeof(dir));
+   strncpy (lpDirSpec, "\*", 3);
+ 
+   hFind = FindFirstFile(lpDirSpec, &FindFileData);
+ 
+   if (hFind == INVALID_HANDLE_VALUE) {
+     return (-1);
+   } else {
+     wsprintf ("First file name is %s\n", FindFileData.cFileName);
+     while (FindNextFile(hFind, &FindFileData) != 0) {
+       wsprintf ("Next file name is %s\n", FindFileData.cFileName);
+     }
+     
+     DWORD dwError = GetLastError();
+     if (dwError == ERROR_NO_MORE_FILES) {
+        FindClose(hFind);
+     } else {
+        wsprintf ("FindNextFile error. Error is %u\n", dwError);
+        return (-1);
+     }
+   }
+   return (0);
+ }
+ */
+ 
+  

Index: Util.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Util.mpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Util.mpl	1 Sep 2003 05:53:28 -0000	1.4
--- Util.mpl	10 Oct 2003 09:49:31 -0000	1.5
***************
*** 93,96 ****
--- 93,102 ----
  ):
  
+ `Package/Assign`(
+  `Util/ToUpperCase`::string,
+  "Convert @s@ to upper case",
+  eval(util_touppercase)
+ ):
+ 
  ######################################################################
  

Index: Util0.mpl
===================================================================
RCS file: /cvsroot/aimmath/AIM/WEB-INF/maple/Util0.mpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Util0.mpl	25 Aug 2003 21:47:18 -0000	1.3
--- Util0.mpl	10 Oct 2003 09:49:31 -0000	1.4
***************
*** 116,119 ****
--- 116,129 ----
  end:
  
+ util_touppercase :=
+ proc(s::string)
+  local b,f;
+ 
+  b := convert(s,bytes);
+  f := proc(c) if (96 < c and c < 123) then c - 32; else c; fi; end;
+  convert(map(f,b),bytes);
+ 
+ end:
+ 
  ######################################################################