Changeset 232 for trunk

Timestamp:

03/23/09 10:16:14 (3 years ago)

Author:

alex

Message:

moved helper handlers used by svn and alex utitlies to alex_utilities

Location:

trunk/lingosource/castlib1

Files:

• alexUtilities.ls (modified) (1 diff)
• subversion_version_field.txt (modified) (1 diff)
• svn_Utilities.ls (modified) (3 diffs)

trunk/lingosource/castlib1/alexUtilities.ls

@@ -3569 +3569 @@
 end
 
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mRemoveWhiteSpaces me, theText
+  
+  if mCheckForXtra(me, "Pregex") = 1 then
+    
+    theText = [theText]
+    PRegEx_Replace(theText, "\s" , "g", "")
+    return theText[1]
+    
+  else
+    whitespaces = [" ", RETURN]
+    repeat with ws = count(whitespaces) down to 1
+      theText = mReplaceChunk(me, theText, whitespaces[ws], "")
+    end repeat
+  end if
+  
+  return theText
+  
+end
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+-- using offset() -> no pregex
+on mReplaceChunk me, srcText, fromChunk, toChunk
+  
+  stelle = offset(fromChunk, srcText)
+  
+  if stelle then
+    
+    len = fromChunk.length
+    newtext = ""
+    replText = toChunk
+    
+    repeat while stelle
+      
+      if stelle > 1 then put char 1 to (stelle - 1) of srcText & replText after newtext
+      else put replText after newtext
+      
+      delete char 1 to (stelle + len - 1) of srcText
+      
+      stelle = offset(fromChunk, srcText)
+      
+      if stelle = 0 then put srcText after newtext
+      
+    end repeat
+    
+  else -- no match
+    
+    return srcText
+  end if
+  
+  return newtext
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mFindUnixAppInPath me, whichBinaryName
+  
+  binaryPath = []
+  
+  binaryPath = mDoShellCmd(me, "for thisBinPath in /usr/bin /bin /usr/sbin /sbin /usr/local/sbin /usr/local/bin /opt/sbin /opt/bin /opt/local/sbin /opt/local/bin /sw/bin /sw/sbin ; do find $thisBinPath -name " & whichBinaryName & " ; done", RETURN, 0, 1)
+  
+  if count(binaryPath) > 0 then return binaryPath[1]
+  
+  return ""
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on getCastlibList me, selectionList, defaultCLNum
+  
+  castlibList = 0
+  
+  if symbolP(selectionList) then
+    -- #all
+    clnum = the number of castlibs
+    castlibList = []
+    repeat with n = 1 to clnum
+      castlibList.add(n)
+    end repeat
+    
+  else
+    
+    selectionList = string(selectionList)
+    if length(selectionList) > 0 then
+      
+      offs = offset("'", selectionList)
+      repeat while offs > 0
+        put QUOTE into char offs of selectionList
+        offs = offset("'", selectionList)
+      end repeat
+      
+      if char 1 of selectionList <> "[" then put "[" before selectionList
+      if the last char of selectionList <> "]" then put "]" after selectionList
+      
+      selectionList = value(selectionList)
+      if listP(selectionList) then
+        clnum = the number of castlibs + 1
+        castlibList = []
+        selectionListCnt = count(selectionList)
+        repeat with n = 1 to selectionListCnt
+          
+          cl = castlib(selectionList[n])
+          if ilk(cl) = #castlib then
+            int = cl.number
+            if castlibList.getPos(int) < 1 then
+              castlibList.add(int)
+            end if
+          else
+            int = integer(selectionList[n])
+            if integerP(int) then
+              if clnum > int then
+                if castlibList.getPos(int) < 1 then castlibList.add(int)
+              end if
+            end if
+          end if
+        end repeat
+      end if
+    end if
+  end if
+  
+  if not(listP(castlibList)) then castlibList = []
+  
+  if count(castlibList) < 1 then
+    if ilk(defaultCLNum) = #integer then
+      castlibList.add(defaultCLNum)
+    else if listP(defaultCLNum) then
+      castlibList = defaultCLNum
+    end if
+  end if
+  
+  return castlibList
+end
+

trunk/lingosource/castlib1/subversion_version_field.txt

@@ -1 @@
-r231
+r233

trunk/lingosource/castlib1/svn_Utilities.ls

@@ -285 +285 @@
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-on mFindUnixAppInPath me, whichBinaryName
-  
-  binaryPath = []
-  
-  binaryPath = mDoShellCmd(me, "for thisBinPath in /usr/bin /bin /usr/sbin /sbin /usr/local/sbin /usr/local/bin /opt/sbin /opt/bin /opt/local/sbin /opt/local/bin /sw/bin /sw/sbin ; do find $thisBinPath -name " & whichBinaryName & " ; done", RETURN, 0, 1)
-  
-  if count(binaryPath) > 0 then return binaryPath[1]
-  
-  return ""
-  
-end
-
-
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 -- this can be used to open the corresponding script in bbedit and svn compare it to head
 
@@ -981 +966 @@
 end
 
-
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-on mRemoveWhiteSpaces me, theText
-  
-  if mCheckForXtra(me, "Pregex") = 1 then
-    
-    theText = [theText]
-    PRegEx_Replace(theText, "\s" , "g", "")
-    return theText[1]
-    
-  else
-    whitespaces = [" ", RETURN]
-    repeat with ws = count(whitespaces) down to 1
-      theText = mReplaceChunk(me, theText, whitespaces[ws], "")
-    end repeat
-  end if
-  
-  return theText
-  
-end
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
--- using offset() -> no pregex
-on mReplaceChunk me, srcText, fromChunk, toChunk
-  
-  stelle = offset(fromChunk, srcText)
-  
-  if stelle then
-    
-    len = fromChunk.length
-    newtext = ""
-    replText = toChunk
-    
-    repeat while stelle
-      
-      if stelle > 1 then put char 1 to (stelle - 1) of srcText & replText after newtext
-      else put replText after newtext
-      
-      delete char 1 to (stelle + len - 1) of srcText
-      
-      stelle = offset(fromChunk, srcText)
-      
-      if stelle = 0 then put srcText after newtext
-      
-    end repeat
-    
-  else -- no match
-    
-    return srcText
-  end if
-  
-  return newtext
-end
-
-
-
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
@@ -2537 +2465 @@
 end
 
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-on getCastlibList me, selectionList, defaultCLNum
-  
-  castlibList = 0
-  
-  if symbolP(selectionList) then
-    -- #all
-    clnum = the number of castlibs
-    castlibList = []
-    repeat with n = 1 to clnum
-      castlibList.add(n)
-    end repeat
-    
-  else
-    
-    selectionList = string(selectionList)
-    if length(selectionList) > 0 then
-      
-      offs = offset("'", selectionList)
-      repeat while offs > 0
-        put QUOTE into char offs of selectionList
-        offs = offset("'", selectionList)
-      end repeat
-      
-      if char 1 of selectionList <> "[" then put "[" before selectionList
-      if the last char of selectionList <> "]" then put "]" after selectionList
-      
-      selectionList = value(selectionList)
-      if listP(selectionList) then
-        clnum = the number of castlibs + 1
-        castlibList = []
-        selectionListCnt = count(selectionList)
-        repeat with n = 1 to selectionListCnt
-          
-          cl = castlib(selectionList[n])
-          if ilk(cl) = #castlib then
-            int = cl.number
-            if castlibList.getPos(int) < 1 then
-              castlibList.add(int)
-            end if
-          else
-            int = integer(selectionList[n])
-            if integerP(int) then
-              if clnum > int then
-                if castlibList.getPos(int) < 1 then castlibList.add(int)
-              end if
-            end if
-          end if
-        end repeat
-      end if
-    end if
-  end if
-  
-  if not(listP(castlibList)) then castlibList = []
-  
-  if count(castlibList) < 1 then
-    if ilk(defaultCLNum) = #integer then
-      castlibList.add(defaultCLNum)
-    else if listP(defaultCLNum) then
-      castlibList = defaultCLNum
-    end if
-  end if
-  
-  return castlibList
-end
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx