diff options
Diffstat (limited to 'tests/array')
-rw-r--r-- | tests/array/tarray.nim | 54 | ||||
-rw-r--r-- | tests/array/tarray2.nim | 2 | ||||
-rw-r--r-- | tests/array/tarray3.nim | 4 | ||||
-rw-r--r-- | tests/array/tarraycons.nim | 2 | ||||
-rw-r--r-- | tests/array/tarraycons2.nim | 2 | ||||
-rw-r--r-- | tests/array/tarrayplus.nim | 2 | ||||
-rw-r--r-- | tests/array/tarrindx.nim | 26 |
7 files changed, 46 insertions, 46 deletions
diff --git a/tests/array/tarray.nim b/tests/array/tarray.nim index 01fbdf422..9cfb758e2 100644 --- a/tests/array/tarray.nim +++ b/tests/array/tarray.nim @@ -2,33 +2,33 @@ discard """ file: "tarray.nim" output: "100124" """ -# simple check for one dimensional arrays - -type - TMyArray = array[0..2, int] - TMyRecord = tuple[x, y: int] - -proc sum(a: TMyarray): int = - result = 0 - var i = 0 - while i < len(a): - inc(result, a[i]) - inc(i) - -proc sum(a: openarray[int]): int = - result = 0 - var i = 0 - while i < len(a): - inc(result, a[i]) - inc(i) - -proc getPos(r: TMyRecord): int = - result = r.x + r.y - -write(stdout, sum([1, 2, 3, 4])) -write(stdout, sum([])) -write(stdout, getPos( (x: 5, y: 7) )) -#OUT 10012 +# simple check for one dimensional arrays + +type + TMyArray = array[0..2, int] + TMyRecord = tuple[x, y: int] + +proc sum(a: TMyarray): int = + result = 0 + var i = 0 + while i < len(a): + inc(result, a[i]) + inc(i) + +proc sum(a: openarray[int]): int = + result = 0 + var i = 0 + while i < len(a): + inc(result, a[i]) + inc(i) + +proc getPos(r: TMyRecord): int = + result = r.x + r.y + +write(stdout, sum([1, 2, 3, 4])) +write(stdout, sum([])) +write(stdout, getPos( (x: 5, y: 7) )) +#OUT 10012 # bug #1669 let filesToCreate = ["tempdir/fl1.a", "tempdir/fl2.b", diff --git a/tests/array/tarray2.nim b/tests/array/tarray2.nim index b6adabb45..1951e6e97 100644 --- a/tests/array/tarray2.nim +++ b/tests/array/tarray2.nim @@ -9,7 +9,7 @@ type TObj = object arr: TMyarray - + proc mul(a, b: TMyarray): TMyArray = result = a for i in 0..len(a)-1: diff --git a/tests/array/tarray3.nim b/tests/array/tarray3.nim index d28778357..24bf26fda 100644 --- a/tests/array/tarray3.nim +++ b/tests/array/tarray3.nim @@ -2,9 +2,9 @@ discard """ file: "tarray3.nim" output: "3" """ -# simple check for two dimensional arrays +# simple check for two dimensional arrays -const +const myData = [[1,2,3], [4, 5, 6]] echo myData[0][2] #OUT 3 diff --git a/tests/array/tarraycons.nim b/tests/array/tarraycons.nim index 7de518b6e..9f09fd405 100644 --- a/tests/array/tarraycons.nim +++ b/tests/array/tarraycons.nim @@ -7,7 +7,7 @@ discard """ type TEnum = enum eA, eB, eC, eD, eE, eF - + const myMapping: array[TEnum, array[0..1, int]] = [ eA: [1, 2], diff --git a/tests/array/tarraycons2.nim b/tests/array/tarraycons2.nim index 0b2a42c2f..72d9e374e 100644 --- a/tests/array/tarraycons2.nim +++ b/tests/array/tarraycons2.nim @@ -6,7 +6,7 @@ discard """ type TEnum = enum eA, eB, eC, eD, eE, eF - + const myMapping: array[TEnum, array[0..1, int]] = [ eA: [1, 2], diff --git a/tests/array/tarrayplus.nim b/tests/array/tarrayplus.nim index 0ea349f4f..33921c0e1 100644 --- a/tests/array/tarrayplus.nim +++ b/tests/array/tarrayplus.nim @@ -6,7 +6,7 @@ proc `+`*[R, T] (v1, v2: array[R, T]): array[R, T] = for i in low(v1)..high(v1): result[i] = v1[i] + v2[i] -var +var v1: array[0..2, float] = [3.0, 1.2, 3.0] v2: array[0..1, float] = [2.0, 1.0] v3 = v1 + v2 diff --git a/tests/array/tarrindx.nim b/tests/array/tarrindx.nim index 13919cc2c..a8d72b338 100644 --- a/tests/array/tarrindx.nim +++ b/tests/array/tarrindx.nim @@ -1,13 +1,13 @@ -# test another strange bug ... (I hate this compiler; it is much too buggy!) - -proc putEnv(key, val: string) = - # XXX: we have to leak memory here, as we cannot - # free it before the program ends (says Borland's - # documentation) - var - env: ptr array[0..500000, char] - env = cast[ptr array[0..500000, char]](alloc(len(key) + len(val) + 2)) - for i in 0..len(key)-1: env[i] = key[i] - env[len(key)] = '=' - for i in 0..len(val)-1: - env[len(key)+1+i] = val[i] +# test another strange bug ... (I hate this compiler; it is much too buggy!) + +proc putEnv(key, val: string) = + # XXX: we have to leak memory here, as we cannot + # free it before the program ends (says Borland's + # documentation) + var + env: ptr array[0..500000, char] + env = cast[ptr array[0..500000, char]](alloc(len(key) + len(val) + 2)) + for i in 0..len(key)-1: env[i] = key[i] + env[len(key)] = '=' + for i in 0..len(val)-1: + env[len(key)+1+i] = val[i] |