summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--compiler/platform.nim2
-rw-r--r--lib/pure/concurrency/threadpool.nim4
-rw-r--r--todo.txt5
3 files changed, 8 insertions, 3 deletions
diff --git a/compiler/platform.nim b/compiler/platform.nim
index 2e78d4fc5..c6cb3d244 100644
--- a/compiler/platform.nim
+++ b/compiler/platform.nim
@@ -1,6 +1,6 @@
 #
 #
-#           The Nimrod Compiler
+#           The Nim Compiler
 #        (c) Copyright 2012 Andreas Rumpf
 #
 #    See the file "copying.txt", included in this
diff --git a/lib/pure/concurrency/threadpool.nim b/lib/pure/concurrency/threadpool.nim
index 28ef25d95..0bd97043a 100644
--- a/lib/pure/concurrency/threadpool.nim
+++ b/lib/pure/concurrency/threadpool.nim
@@ -65,7 +65,9 @@ proc barrierEnter(b: ptr Barrier) {.compilerProc, inline.} =
 proc barrierLeave(b: ptr Barrier) {.compilerProc, inline.} =
   atomicInc b.left
   when not defined(x86): fence()
-  if b.interest and b.left == b.entered: signal(b.cv)
+  # We may not have seen the final value of b.entered yet,
+  # so we need to check for >= instead of ==.
+  if b.interest and b.left >= b.entered: signal(b.cv)
 
 proc openBarrier(b: ptr Barrier) {.compilerProc, inline.} =
   b.entered = 0
diff --git a/todo.txt b/todo.txt
index 6068c049b..5b0d00e16 100644
--- a/todo.txt
+++ b/todo.txt
@@ -3,7 +3,10 @@ version 0.10
 
   Repetition renders the ridiculous reasonable.
 
-- introduce ``--experimental`` switch
+- document 'converter'
+- document the tables module better
+
+
 - c2nim depends on the compiler
 - make nimble part of the distribution
 - split idetools into separate tool
cbc ^
6d442a40a ^

7f18d7cbc ^

6d442a40a ^
7f18d7cbc ^
6d442a40a ^

7f18d7cbc ^

6d442a40a ^
7f18d7cbc ^

6d442a40a ^
7f18d7cbc ^



6d442a40a ^
7f18d7cbc ^


6d442a40a ^

7f18d7cbc ^


6d442a40a ^
7f18d7cbc ^




6d442a40a ^
7f18d7cbc ^
6d442a40a ^
7f18d7cbc ^
6d442a40a ^
7f18d7cbc ^
6d442a40a ^
7f18d7cbc ^
6d442a40a ^
7f18d7cbc ^





6d442a40a ^
7f18d7cbc ^


6d442a40a ^
7f18d7cbc ^




6d442a40a ^


7f18d7cbc ^






6d442a40a ^
7f18d7cbc ^
6d442a40a ^
7f18d7cbc ^
6d442a40a ^
7f18d7cbc ^
6d442a40a ^
7f18d7cbc ^
6d442a40a ^
7f18d7cbc ^
6d442a40a ^
7f18d7cbc ^
6d442a40a ^
7f18d7cbc ^












6d442a40a ^
7f18d7cbc ^
6d442a40a ^
7f18d7cbc ^








6d442a40a ^

7f18d7cbc ^
6d442a40a ^
7f18d7cbc ^















6d442a40a ^
7f18d7cbc ^
6d442a40a ^
7f18d7cbc ^


6d442a40a ^
7f18d7cbc ^
6d442a40a ^
7f18d7cbc ^





6d442a40a ^
7f18d7cbc ^
6d442a40a ^
7f18d7cbc ^




6d442a40a ^
7f18d7cbc ^

6d442a40a ^
7f18d7cbc ^
6d442a40a ^
7f18d7cbc ^


6d442a40a ^
7f18d7cbc ^





6d442a40a ^
7f18d7cbc ^







6d442a40a ^

7f18d7cbc ^

6d442a40a ^

7f18d7cbc ^
6d442a40a ^

7f18d7cbc ^



6d442a40a ^
7f18d7cbc ^

















1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276




                                 


                                                        









































                                               

                                                                                                                     










                                    
                          



                           
                                
 

                         

                                                   
                                                             
 

                                                                

                                                             
                   

                                                              
                          



                                           
                                                     


                                              

                              


                                     
                                           




                                       
                 
                                           
                 
                                                 
                 
           
                 
                                                 
                 





                                  
                                     


                
                                 




                      


                                       






                             
                 
          
                 
          
                 
          
                 
          
                 
          
                 
          
                 












                                  
                     
         
                                








                                                                     

                                            
                              
                                        















                                                                         
                       
           
                       


                             
                       
           
                       





                                  
                       
           
                       




                                                             
                    

                     
                           
                                                             
                     


                      
                                        





                                                             
                                        







                                  

                              

          

                                  
 

                                       



                                           
                                                     

















                                                                            
discard """
  cmd: "nim c --threads:on $file"
  output: '''true'''
"""

import hashes, tables, sharedtables, algorithm, sequtils

proc sortedPairs[T](t: T): auto = toSeq(t.pairs).sorted

const
  data = {
    "34": 123456, "12": 789,
    "90": 343, "0": 34404,
    "1": 344004, "2": 344774,
    "3": 342244, "4": 3412344,
    "5": 341232144, "6": 34214544,
    "7": 3434544, "8": 344544,
    "9": 34435644, "---00": 346677844,
    "10": 34484, "11": 34474, "19": 34464,
    "20": 34454, "30": 34141244, "40": 344114,
    "50": 344490, "60": 344491, "70": 344492,
    "80": 344497}

  sorteddata = {
    "---00": 346677844,
    "0": 34404,
    "1": 344004,
    "10": 34484,
    "11": 34474,
    "12": 789,
    "19": 34464,
    "2": 344774, "20": 34454,
    "3": 342244, "30": 34141244,
    "34": 123456,
    "4": 3412344, "40": 344114,
    "5": 341232144, "50": 344490,
    "6": 34214544, "60": 344491,
    "7": 3434544, "70": 344492,
    "8": 344544, "80": 344497,
    "9": 34435644,
    "90": 343}

block tableTest1:
  var t = initTable[tuple[x, y: int], string]()
  t[(0,0)] = "00"
  t[(1,0)] = "10"
  t[(0,1)] = "01"
  t[(1,1)] = "11"
  for x in 0..1:
    for y in 0..1:
      doAssert t[(x,y)] == $x & $y
  doAssert t.sortedPairs == @[((x: 0, y: 0), "00"), ((x: 0, y: 1), "01"), ((x: 1, y: 0), "10"), ((x: 1, y: 1), "11")]

block tableTest2:
  var t = initTable[string, float]()
  t["test"] = 1.2345
  t["111"] = 1.000043
  t["123"] = 1.23
  t.del("111")

  t["012"] = 67.9
  t["123"] = 1.5 # test overwriting

  doAssert t["123"] == 1.5
  try:
    echo t["111"] # deleted
  except KeyError:
    discard
  doAssert(not hasKey(t, "111"))

  doAssert "123" in t
  doAssert("111" notin t)

  for key, val in items(data): t[key] = val.toFloat
  for key, val in items(data): doAssert t[key] == val.toFloat

  doAssert(not t.hasKeyOrPut("456", 4.0))     # test absent key
  doAssert t.hasKeyOrPut("012", 3.0)          # test present key
  var x = t.mgetOrPut("111", 1.5)           # test absent key
  x = x * 2
  doAssert x == 3.0
  x = t.mgetOrPut("test", 1.5)              # test present key
  x = x * 2
  doAssert x == 2 * 1.2345

block orderedTableTest1:
  var t = initOrderedTable[string, int](2)
  for key, val in items(data): t[key] = val
  for key, val in items(data): doAssert t[key] == val
  var i = 0
  # `pairs` needs to yield in insertion order:
  for key, val in pairs(t):
    doAssert key == data[i][0]
    doAssert val == data[i][1]
    inc(i)

  for key, val in mpairs(t): val = 99
  for val in mvalues(t): doAssert val == 99

block orderedTableTest2:
  var
    s = initOrderedTable[string, int]()
    t = initOrderedTable[string, int]()
  doAssert s == t
  for key, val in items(data): t[key] = val
  doAssert s != t
  for key, val in items(sorteddata): s[key] = val
  doAssert s != t
  t.clear()
  doAssert s != t
  for key, val in items(sorteddata): t[key] = val
  doAssert s == t

block countTableTest1:
  var s = data.toTable
  var t = initCountTable[string]()

  for k in s.keys: t.inc(k)
  for k in t.keys: doAssert t[k] == 1
  t.inc("90", 3)
  t.inc("12", 2)
  t.inc("34", 1)
  doAssert t.largest()[0] == "90"

  t.sort()
  var i = 0
  for k, v in t.pairs:
    case i
    of 0: doAssert k == "90" and v == 4
    of 1: doAssert k == "12" and v == 3
    of 2: doAssert k == "34" and v == 2
    else: break
    inc i

block countTableTest2:
  var
    s = initCountTable[int]()
    t = initCountTable[int]()
  doAssert s == t
  s.inc(1)
  doAssert s != t
  t.inc(2)
  doAssert s != t
  t.inc(1)
  doAssert s != t
  s.inc(2)
  doAssert s == t
  s.inc(1)
  doAssert s != t
  t.inc(1)
  doAssert s == t

block mpairsTableTest1:
  var t = initTable[string, int]()
  t["a"] = 1
  t["b"] = 2
  t["c"] = 3
  t["d"] = 4
  for k, v in t.mpairs:
    if k == "a" or k == "c":
      v = 9

  for k, v in t.pairs:
    if k == "a" or k == "c":
      doAssert v == 9
    else:
      doAssert v != 1 and v != 3

block SyntaxTest:
  var x = toTable[int, string]({:})

block zeroHashKeysTest:
  proc doZeroHashValueTest[T, K, V](t: T, nullHashKey: K, value: V) =
    let initialLen = t.len
    var testTable = t
    testTable[nullHashKey] = value
    doAssert testTable[nullHashKey] == value
    doAssert testTable.len == initialLen + 1
    testTable.del(nullHashKey)
    doAssert testTable.len == initialLen

  # with empty table
  doZeroHashValueTest(toTable[int,int]({:}), 0, 42)
  doZeroHashValueTest(toTable[string,int]({:}), "", 23)
  doZeroHashValueTest(toOrderedTable[int,int]({:}), 0, 42)
  doZeroHashValueTest(toOrderedTable[string,int]({:}), "", 23)

  # with non-empty table
  doZeroHashValueTest(toTable[int,int]({1:2}), 0, 42)
  doZeroHashValueTest(toTable[string,string]({"foo": "bar"}), "", "zero")
  doZeroHashValueTest(toOrderedTable[int,int]({3:4}), 0, 42)
  doZeroHashValueTest(toOrderedTable[string,string]({"egg": "sausage"}),
      "", "spam")

block clearTableTest:
  var t = data.toTable
  doAssert t.len() != 0
  t.clear()
  doAssert t.len() == 0

block clearOrderedTableTest:
  var t = data.toOrderedTable
  doAssert t.len() != 0
  t.clear()
  doAssert t.len() == 0

block clearCountTableTest:
  var t = initCountTable[string]()
  t.inc("90", 3)
  t.inc("12", 2)
  t.inc("34", 1)
  doAssert t.len() != 0
  t.clear()
  doAssert t.len() == 0

block withKeyTest:
  var t: SharedTable[int, int]
  t.init()
  t.withKey(1) do (k: int, v: var int, pairExists: var bool):
    doAssert(v == 0)
    pairExists = true
    v = 42
  doAssert(t.mget(1) == 42)
  t.withKey(1) do (k: int, v: var int, pairExists: var bool):
    doAssert(v == 42)
    pairExists = false
  try:
    discard t.mget(1)
    doAssert(false, "KeyError expected")
  except KeyError:
    discard
  t.withKey(2) do (k: int, v: var int, pairExists: var bool):
    pairExists = false
  try:
    discard t.mget(2)
    doAssert(false, "KeyError expected")
  except KeyError:
    discard

block takeTest:
  var t = initTable[string, int]()
  t["key"] = 123

  var val = 0
  doAssert(t.take("key", val))
  doAssert(val == 123)

  val = -1
  doAssert(not t.take("key", val))
  doAssert(val == -1)

  doAssert(not t.take("otherkey", val))
  doAssert(val == -1)

proc orderedTableSortTest() =
  var t = initOrderedTable[string, int](2)
  for key, val in items(data): t[key] = val
  for key, val in items(data): doAssert t[key] == val
  t.sort(proc (x, y: tuple[key: string, val: int]): int = cmp(x.key, y.key))
  var i = 0
  # `pairs` needs to yield in sorted order:
  for key, val in pairs(t):
    doAssert key == sorteddata[i][0]
    doAssert val == sorteddata[i][1]
    inc(i)

  # check that lookup still works:
  for key, val in pairs(t):
    doAssert val == t[key]
  # check that insert still works:
  t["newKeyHere"] = 80


orderedTableSortTest()
echo "true"