Changeset 3949 for branches/blt4/lang/tcl/src

Timestamp:

Sep 24, 2013, 11:57:53 AM (11 years ago)

Author:

gah

Message:

sync with trunk

Location:

branches/blt4/lang/tcl/src

Files:

• Makefile.in (modified) (2 diffs)
• Rappture_Init.c (modified) (3 diffs)
• RpCurses.c (modified) (1 diff)
• RpDaemon.c (modified) (1 diff)
• RpEncodeTclInterface.cc (modified) (1 diff)
• RpLibraryTclInterface.cc (modified) (1 diff)
• RpRlimit.c (modified) (1 diff)
• RpRusage.c (modified) (1 diff)
• RpSignal.c (modified) (1 diff)
• RpSlice.c (modified) (1 diff)
• RpSysinfo.c (modified) (1 diff)
• RpUnitsTclInterface.cc (modified) (12 diffs)
• RpUtilsTclInterface.cc (modified) (1 diff)
• RpWinResource.c (modified) (1 diff)
• RpWinResource.h (modified) (1 diff)

branches/blt4/lang/tcl/src/Makefile.in

@@ -39 +39 @@
   -I$(srcdir)/../../../src/objects \
   -I$(includedir)
-version         = @PACKAGE_VERSION@
-DEFINES         = -DPACKAGE_VERSION=\"$(version)\"
+RAPPTURE_VERSION = @PACKAGE_VERSION@
+SVN_VERSION     := $(shell svnversion $(srcdir))
+DEFINES         = -DSVN_VERSION=\"$(SVN_VERSION)\" \
+                  -DRAPPTURE_VERSION=\"$(RAPPTURE_VERSION)\"
 
 RANLIB          = @RANLIB@
@@ -79 +81 @@
 # Not using     RpLibraryTclInterface.o \
 
-name        = Rappture$(version)
+name        = Rappture$(RAPPTURE_VERSION)
 libname     = $(name)
 lib         = $(libname)$(SHLIB_SUFFIX)

branches/blt4/lang/tcl/src/Rappture_Init.c

@@ -7 +7 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and
@@ -26 +26 @@
 extern Tcl_AppInitProc RpRusage_Init;
 extern Tcl_AppInitProc RpSignal_Init;
-extern Tcl_AppInitProc RpSplit_Init;
+extern Tcl_AppInitProc RpSlice_Init;
 extern Tcl_AppInitProc RpSysinfo_Init;
 extern Tcl_AppInitProc RpDaemon_Init;
@@ -50 +50 @@
         return TCL_ERROR;
     }
-    if (Tcl_PkgProvide(interp, "Rappture", PACKAGE_VERSION) != TCL_OK) {
+    if (Tcl_PkgProvide(interp, "Rappture", RAPPTURE_VERSION) != TCL_OK) {
         return TCL_ERROR;
     }

branches/blt4/lang/tcl/src/RpCurses.c

@@ -16 +16 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2011  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/lang/tcl/src/RpDaemon.c

@@ -7 +7 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/lang/tcl/src/RpEncodeTclInterface.cc

@@ -6 +6 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2007  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/lang/tcl/src/RpLibraryTclInterface.cc

@@ -8 +8 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/lang/tcl/src/RpRlimit.c

@@ -9 +9 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/lang/tcl/src/RpRusage.c

@@ -9 +9 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/lang/tcl/src/RpSignal.c

@@ -8 +8 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/lang/tcl/src/RpSlice.c

@@ -17 +17 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2009  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/lang/tcl/src/RpSysinfo.c

@@ -7 +7 @@
  * ======================================================================
  *  AUTHOR:  Michael McLennan, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/lang/tcl/src/RpUnitsTclInterface.cc

@@ -7 +7 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and
@@ -38 +38 @@
  */
 
+#include <algorithm> 
+#include <functional>
+#include <cctype>
+
+// Trim from start
+static inline std::string &ltrim(std::string &s) 
+{
+    s.erase(s.begin(), 
+        std::find_if(s.begin(), s.end(), 
+                     std::not1(std::ptr_fun<int, int>(std::isspace))));
+    return s;
+}
+
+// Trim from end
+static inline std::string &rtrim(std::string &s) 
+{
+    s.erase(std::find_if(s.rbegin(), s.rend(), 
+        std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
+    return s;
+}
+
+// Trim from both ends
+static inline std::string &trim(std::string &s) 
+{
+    return ltrim(rtrim(s));
+}
+
 extern "C" int
 RpUnits_Init(Tcl_Interp *interp)
@@ -71 +98 @@
  * provided in -context option.
  */
+
 
 int
@@ -134 +162 @@
                         return TCL_ERROR;
                     }
-                }
-                else {
+                } else {
                     // if user does not specify wishes for this option,
                     // set fromUnitsName to an empty string.
                     fromUnitsName = "";
                 }
-            }
-            else if ( option == "-to" ) {
+            } else if ( option == "-to" ) {
                 nextarg++;
                 if (argv[nextarg] != NULL) {
@@ -155 +181 @@
                         return TCL_ERROR;
                     }
-                }
-                else {
+                } else {
                     // if user does not specify wishes for this option,
                     // set toUnitsName to an empty string.
                     toUnitsName = "";
                 }
-            }
-            else if ( option == "-units" ) {
+            } else if ( option == "-units" ) {
                 nextarg++;
                 if (argv[nextarg] != NULL) {
@@ -173 +197 @@
                         return TCL_ERROR;
                     }
-                }
-                else {
+                } else {
                     // if user does not specify wishes for this option,
                     // return error.
@@ -182 +205 @@
                     return TCL_ERROR;
                 }
-            }
-            else {
+            } else {
                 // unrecognized option
                 Tcl_AppendResult(interp, "bad option \"", argv[nextarg], 
@@ -192 +214 @@
 
             nextarg++;
-        }
-        else {
+        } else {
             // unrecognized input
             Tcl_AppendResult(interp, "bad option \"", argv[nextarg], "\": ",
@@ -208 +229 @@
     // or if we should use those provided in -context option
 
-    double value;
-    value = strtod(inValue.c_str(),&endptr);
+
+    // Trim away white space from the value.  
+    trim(inValue);
+
+    strtod(inValue.c_str(), &endptr);
     if (endptr == inValue.c_str()) {
         // there was no numeric value that could be pulled from inValue
@@ -224 +248 @@
                 inValue.c_str(), mesg.c_str(), (char*)NULL);
         return TCL_ERROR;
-    }
-    else if ( ((unsigned)(endptr - inValue.c_str())) == inValue.length() ) {
+    } else if ( ((unsigned)(endptr - inValue.c_str())) == inValue.length() ) {
         // add 1 because we are subtracting indicies
         // there were no units at the end of the inValue string
@@ -233 +256 @@
         if (!fromUnitsName.empty()) {
             val = inValue + fromUnitsName;
-        }
-        else {
+        } else {
             Tcl_AppendResult(interp, "value: \"", inValue.c_str(),
                     "\" has unrecognized units", (char*)NULL);
             return TCL_ERROR;
         }
-    }
-    else {
+    } else {
         // there seemed to be units at the end of the inValue string
         // we will ignore the -context flag and use the units in inValue
@@ -253 +274 @@
         Tcl_AppendResult(interp, convertedVal.c_str(), (char*)NULL);
         retVal = TCL_OK;
-    }
-    else {
+    } else {
         // error while converting
         Tcl_AppendResult(interp, 

branches/blt4/lang/tcl/src/RpUtilsTclInterface.cc

@@ -7 +7 @@
  * ======================================================================
  *  AUTHOR:  Derrick Kearney, Purdue University
- *  Copyright (c) 2004-2006  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/lang/tcl/src/RpWinResource.c

@@ -12 +12 @@
  * ======================================================================
  *  AUTHOR:  Nicholas J. Kisseberth, Purdue University
- *  Copyright (c) 2006  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and

branches/blt4/lang/tcl/src/RpWinResource.h

@@ -13 +13 @@
  * ======================================================================
  *  AUTHOR:  Nicholas J. Kisseberth, Purdue University
- *  Copyright (c) 2006  Purdue Research Foundation
+ *  Copyright (c) 2004-2012  HUBzero Foundation, LLC
  *
  *  See the file "license.terms" for information on usage and