diff options
Diffstat (limited to 'lib')
-rwxr-xr-x | lib/impure/db_mysql.nim | 2 | ||||
-rwxr-xr-x | lib/impure/db_postgres.nim | 2 | ||||
-rwxr-xr-x | lib/impure/db_sqlite.nim | 2 | ||||
-rwxr-xr-x | lib/pure/htmlgen.nim | 2 | ||||
-rwxr-xr-x | lib/pure/strutils.nim | 10 |
5 files changed, 14 insertions, 4 deletions
diff --git a/lib/impure/db_mysql.nim b/lib/impure/db_mysql.nim index 4c77c707f..2b94ab614 100755 --- a/lib/impure/db_mysql.nim +++ b/lib/impure/db_mysql.nim @@ -106,7 +106,7 @@ proc getRow*(db: TDbConn, query: TSqlQuery, var sqlres = mysql.UseResult(db) if sqlres != nil: var L = int(mysql.NumFields(sqlres)) - var result = newRow(L) + result = newRow(L) var row = mysql.FetchRow(sqlres) if row != nil: for i in 0..L-1: diff --git a/lib/impure/db_postgres.nim b/lib/impure/db_postgres.nim index dff607081..506da9c84 100755 --- a/lib/impure/db_postgres.nim +++ b/lib/impure/db_postgres.nim @@ -108,7 +108,7 @@ proc getRow*(db: TDbConn, query: TSqlQuery, ## retrieves a single row. var res = setupQuery(db, query, args) var L = int(PQnfields(res)) - var result = newRow(L) + result = newRow(L) setRow(res, result, 0, L) PQclear(res) diff --git a/lib/impure/db_sqlite.nim b/lib/impure/db_sqlite.nim index 3f5be772c..b6c8003b9 100755 --- a/lib/impure/db_sqlite.nim +++ b/lib/impure/db_sqlite.nim @@ -106,7 +106,7 @@ proc getRow*(db: TDbConn, query: TSqlQuery, ## retrieves a single row. var stmt = setupQuery(db, query, args) var L = int(columnCount(stmt)) - var result = newRow(L) + result = newRow(L) if step(stmt) == SQLITE_ROW: setRow(stmt, result, L) if finalize(stmt) != SQLITE_OK: dbError(db) diff --git a/lib/pure/htmlgen.nim b/lib/pure/htmlgen.nim index b61aa2925..86ee4159b 100755 --- a/lib/pure/htmlgen.nim +++ b/lib/pure/htmlgen.nim @@ -222,7 +222,7 @@ macro head*(e: expr): expr = macro html*(e: expr): expr = ## generates the HTML ``html`` element. - result = xmlCheckedTag(e, "html", "", "xmlns") + result = xmlCheckedTag(e, "html", "xmlns", "") macro hr*(e: expr): expr = ## generates the HTML ``hr`` element. diff --git a/lib/pure/strutils.nim b/lib/pure/strutils.nim index 8e3816904..368ef2564 100755 --- a/lib/pure/strutils.nim +++ b/lib/pure/strutils.nim @@ -531,6 +531,16 @@ proc endsWith*(s, suffix: string): bool {.noSideEffect, if s[i+j] != suffix[i]: return false inc(i) if suffix[i] == '\0': return true + +proc continuesWith*(s, substr: string, start: int): bool {.noSideEffect, + rtl, extern: "nsuContinuesWith".} = + ## Returns true iff ``s`` continues with ``substr`` at position ``start``. + ## If ``substr == ""`` true is returned. + var i = 0 + while true: + if substr[i] == '\0': return true + if s[i+start] != substr[i]: return false + inc(i) proc addSep*(dest: var string, sep = ", ", startLen = 0) {.noSideEffect, inline.} = |