added base64 module; decoding still broken

5 files changed, 142 insertions, 13 deletions

diff --git a/doc/theindex.txt b/doc/theindex.txt
index 4bac25c46..ea6a9691a 100755
--- a/doc/theindex.txt
+++ b/doc/theindex.txt
@@ -233,10 +233,10 @@ Index
      * `colors.html#102 <colors.html#102>`_
 
    `=~`:idx:
-     `re.html#113 <re.html#113>`_
+     `regexprs.html#111 <regexprs.html#111>`_
 
    `=~`:idx:
-     `regexprs.html#111 <regexprs.html#111>`_
+     `re.html#113 <re.html#113>`_
 
    `=~`:idx:
      `pegs.html#143 <pegs.html#143>`_
@@ -4235,13 +4235,6 @@ Index
    `ONLY_KILL_QUERY`:idx:
      `mysql.html#189 <mysql.html#189>`_
 
-   `Open`:idx:
-     * `system.html#512 <system.html#512>`_
-     * `system.html#513 <system.html#513>`_
-     * `db_postgres.html#118 <db_postgres.html#118>`_
-     * `db_mysql.html#118 <db_mysql.html#118>`_
-     * `db_sqlite.html#118 <db_sqlite.html#118>`_
-
    `open`:idx:
      * `lexbase.html#104 <lexbase.html#104>`_
      * `parsecfg.html#104 <parsecfg.html#104>`_
@@ -4251,6 +4244,13 @@ Index
      * `httpserver.html#103 <httpserver.html#103>`_
      * `json.html#105 <json.html#105>`_
 
+   `Open`:idx:
+     * `system.html#512 <system.html#512>`_
+     * `system.html#513 <system.html#513>`_
+     * `db_postgres.html#118 <db_postgres.html#118>`_
+     * `db_mysql.html#118 <db_mysql.html#118>`_
+     * `db_sqlite.html#118 <db_sqlite.html#118>`_
+
    `openarray`:idx:
      * `tut1.html#119 <tut1.html#119>`_
      * `system.html#130 <system.html#130>`_
diff --git a/lib/pure/base64.nim b/lib/pure/base64.nim
new file mode 100644
index 000000000..a4673b5f7
--- /dev/null
+++ b/lib/pure/base64.nim
@@ -0,0 +1,129 @@
+#
+#
+#            Nimrod's Runtime Library
+#        (c) Copyright 2010 Andreas Rumpf
+#
+#    See the file "copying.txt", included in this
+#    distribution, for details about the copyright.
+#
+
+## This module implements a base64 encoder and decoder.
+
+const 
+  cb64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
+
+proc encode*(s: string, lineLen = 75, newLine="\13\10"): string = 
+  ## encodes `s` into base64 representation. After `lineLen` characters, a 
+  ## `newline` is added.
+  var total = ((len(s) + 2) div 3) * 4
+  var numLines = (total + (lineLen - 1)) div lineLen
+  if numLines > 0: inc(total, (numLines-1) * newLine.len)

+
+  result = newString(total)
+  var i = 0
+  var r = 0
+  var currLine = 0
+  while i < s.len - 2:
+    var a = ord(s[i])
+    var b = ord(s[i+1])
+    var c = ord(s[i+2])
+    result[r] = cb64[a shr 2]
+    result[r+1] = cb64[((a and 3) shl 4) or ((b and 0xF0) shr 4)]
+    result[r+2] = cb64[((b and 0x0F) shl 2) or ((c and 0xC0) shr 6)] 
+    result[r+3] = cb64[c and 0x3F] 
+    inc(r, 4)
+    inc(i, 3)
+    inc(currLine, 4)
+    if currLine >= lineLen and i != s.len-2: 
+      for x in items(newLine): 
+        result[r] = x
+        inc(r)
+      currLine = 0
+
+  if i < s.len-1:
+    var a = ord(s[i])
+    var b = ord(s[i+1])
+    result[r] = cb64[a shr 2]
+    result[r+1] = cb64[((a and 3) shl 4) or ((b and 0xF0) shr 4)]
+    result[r+2] = cb64[((b and 0x0F) shl 2)] 
+    result[r+3] = '='
+    assert(r+4 == result.len)
+  elif i < s.len:
+    var a = ord(s[i])
+    result[r] = cb64[a shr 2]
+    result[r+1] = cb64[(a and 3) shl 4]
+    result[r+2] = '='
+    result[r+3] = '='
+    assert(r+4 == result.len)
+  else:
+    assert(r == result.len)
+
+proc decodeByte(b: char): int {.inline.} = 
+  case b
+  of '+': result = ord('>')
+  of '0'..'9': result = ord(b) + 4
+  of 'A'..'Z': result = ord(b) - ord('A')
+  of 'a'..'z': result = ord(b) - 71
+  else: result = 63
+
+proc decode*(s: string): string = 
+  ## decodes a string in base64 representation back into its original form.
+  ## Whitespace is skipped.
+  const Whitespace = {' ', '\t', '\v', '\r', '\l', '\f'}
+  var total = ((len(s) + 3) div 4) * 3
+  # total is an upper bound, as we will skip arbitrary whitespace:
+  result = newString(total)
+
+  var i = 0
+  var r = 0
+  while true:
+    while s[i] in Whitespace: inc(i)
+    if i < s.len-3:
+      var a = s[i].decodeByte
+      var b = s[i+1].decodeByte
+      var c = s[i+2].decodeByte
+      var d = s[i+3].decodeByte
+      
+      result[r] = chr((a shl 2) or ((b shr 4) and 0x03))
+      result[r+1] = chr((b shl 4) or ((c shr 2) and 0x0F))
+      result[r+2] = chr((c shl 6) or (d and 0x3F))
+      inc(r, 3)
+      inc(i, 4)
+    else: break
+  if i < s.len-2 and s[i+2] == '=':
+    var a = s[i].decodeByte
+    var b = s[i+1].decodeByte
+    result[r] = chr(a shl 2 or ((b shr 4) and 3))
+    inc(r)
+  elif i < s.len-3 and s[i+3] == '=':
+    var a = s[i].decodeByte
+    var b = s[i+1].decodeByte
+    var c = s[i+2].decodeByte
+    result[r] = chr((a shl 2) or ((b shr 4) and 3))
+    result[r+1] = chr((b shl 4) or ((c shr 2) and 0xF))
+    inc(r, 2)
+  setLen(result, r)
+  
+when isMainModule:
+  assert encode("leasure.") == "bGVhc3VyZS4="
+  assert encode("easure.") == "ZWFzdXJlLg=="
+  assert encode("asure.") == "YXN1cmUu"
+  assert encode("sure.") == "c3VyZS4="
+  
+  const longText = """Man is distinguished, not only by his reason, but by this
+    singular passion from other animals, which is a lust of the mind, 
+    that by a perseverance of delight in the continued and indefatigable
+    generation of knowledge, exceeds the short vehemence of any carnal
+    pleasure."""
+  const tests = ["", "abc", "xyz", "man", "leasure.", "sure.", "easure.",
+                 "asure.", longText]
+  for t in items(tests):
+    if decode(encode(t)) != t:
+      echo "##", t, "##"
+
+  echo encode("Man is distinguished, not only by his reason, but by this" &
+    " singular passion from other animals, which is a lust of the mind, " &
+    "that by a perseverance of delight in the continued and indefatigable" & 
+    " generation of knowledge, exceeds the short vehemence of any carnal" &
+    " pleasure.")
+
diff --git a/lib/pure/htmlparser.nim b/lib/pure/htmlparser.nim
index 892534ce1..104c53833 100755
--- a/lib/pure/htmlparser.nim
+++ b/lib/pure/htmlparser.nim
@@ -20,7 +20,7 @@
 ##
 ## Every tag in the resulting tree is in lower case.
 ##
-## **Note:** The resulting ``PXmlNode`` already use the ``clientData`` field, 
+## **Note:** The resulting ``PXmlNode`` already uses the ``clientData`` field, 
 ## so it cannot be used by clients of this library.
 
 import strutils, streams, parsexml, xmltree, unicode, strtabs
diff --git a/lib/pure/xmltree.nim b/lib/pure/xmltree.nim
index 8604078fb..57988698b 100755
--- a/lib/pure/xmltree.nim
+++ b/lib/pure/xmltree.nim
@@ -240,12 +240,12 @@ proc xmlConstructor(e: PNimrodNode): PNimrodNode {.compileTime.} =
       if a[i].kind == nnkExprEqExpr:
         attrs.add(toStrLit(a[i][0]))
         attrs.add(a[i][1])
-        echo repr(attrs)
+        #echo repr(attrs)
       else:
         elements.add(a[i])
     result.add(elements)
     if attrs.len > 1: 
-      echo repr(newStringTabCall)
+      #echo repr(newStringTabCall)
       result.add(newStringTabCall)
   else:
     result = newCall("newXmlTree", toStrLit(a))
diff --git a/rod/nversion.nim b/rod/nversion.nim
index bda09d6c8..8fb436f11 100755
--- a/rod/nversion.nim
+++ b/rod/nversion.nim
@@ -15,6 +15,6 @@ const
   defaultAsmMarkerSymbol* = '!'
   VersionMajor* = 0
   VersionMinor* = 8
-  VersionPatch* = 10
+  VersionPatch* = 11
   VersionAsString* = $VersionMajor & "." & $VersionMinor & "." & $VersionPatch