From 7819b84475ca6ba1cf3e9976c7140ea11775b81d Mon Sep 17 00:00:00 2001 From: Araq <rumpf_a@web.de> Date: Tue, 15 Nov 2011 23:03:14 +0100 Subject: bugfixes: objects still invalid for constants; fixed a typo concerning 'high' in eval context --- compiler/evals.nim | 2 +- compiler/seminst.nim | 7 +++---- compiler/transf.nim | 11 ++++++++--- compiler/types.nim | 13 +++++++------ lib/pure/actors.cfg | 3 +++ tests/accept/run/tactiontable.nim | 2 +- tests/reject/tactiontable2.nim | 28 ++++++++++++++++++++++++++++ todo.txt | 1 + 8 files changed, 52 insertions(+), 15 deletions(-) create mode 100644 lib/pure/actors.cfg create mode 100644 tests/reject/tactiontable2.nim diff --git a/compiler/evals.nim b/compiler/evals.nim index 76bbf4c0a..cc05267f4 100755 --- a/compiler/evals.nim +++ b/compiler/evals.nim @@ -641,7 +641,7 @@ proc evalHigh(c: PEvalContext, n: PNode): PNode = result = evalAux(c, n.sons[1], {}) if isSpecial(result): return case skipTypes(n.sons[1].typ, abstractVar).kind - of tyOpenArray, tySequence: result = newIntNodeT(sonsLen(result), n) + of tyOpenArray, tySequence: result = newIntNodeT(sonsLen(result)-1, n) of tyString: result = newIntNodeT(len(result.strVal) - 1, n) else: InternalError(n.info, "evalHigh") diff --git a/compiler/seminst.nim b/compiler/seminst.nim index 130e00134..d7dbe623b 100755 --- a/compiler/seminst.nim +++ b/compiler/seminst.nim @@ -77,10 +77,9 @@ proc instantiateBody(c: PContext, n: PNode, result: PSym) = if result.kind in {skProc, skMethod, skConverter}: addResult(c, result.typ.sons[0], n.info) addResultNode(c, n) - n.sons[bodyPos] = semStmtScope(c, n.sons[bodyPos]) - if result.kind == skIterator: - # XXX Bad hack for tests/titer2: - n.sons[bodyPos] = transform(c.module, n.sons[bodyPos]) + var b = semStmtScope(c, n.sons[bodyPos]) + # XXX Bad hack for tests/titer2 and tests/tactiontable + n.sons[bodyPos] = transform(c.module, b) #echo "code instantiated ", result.name.s excl(result.flags, sfForward) popProcCon(c) diff --git a/compiler/transf.nim b/compiler/transf.nim index 78ca50e3b..3c715be6d 100755 --- a/compiler/transf.nim +++ b/compiler/transf.nim @@ -736,11 +736,12 @@ proc processTransf(context: PPassContext, n: PNode): PNode = # Note: For interactive mode we cannot call 'passes.skipCodegen' and skip # this step! We have to rely that the semantic pass transforms too errornous # nodes into an empty node. - if passes.skipCodegen(n) or context.fromCache: return n + if passes.skipCodegen(n) or context.fromCache or nfTransf in n.flags: return n var c = PTransf(context) pushTransCon(c, newTransCon(getCurrOwner(c))) result = PNode(transform(c, n)) popTransCon(c) + incl(result.flags, nfTransf) proc openTransf(module: PSym, filename: string): PPassContext = var n: PTransf @@ -762,6 +763,10 @@ proc transfPass(): TPass = result.close = processTransf # we need to process generics too! proc transform*(module: PSym, n: PNode): PNode = - var c = openTransf(module, "") - result = processTransf(c, n) + if nfTransf in n.flags: + result = n + else: + var c = openTransf(module, "") + result = processTransf(c, n) + incl(result.flags, nfTransf) diff --git a/compiler/types.nim b/compiler/types.nim index 7e34031aa..2a96f14af 100755 --- a/compiler/types.nim +++ b/compiler/types.nim @@ -280,8 +280,8 @@ proc isGBCRef(t: PType): bool = result = t.kind in {tyRef, tySequence, tyString} proc containsGarbageCollectedRef(typ: PType): bool = - # returns true if typ contains a reference, sequence or string (all the things - # that are garbage-collected) + # returns true if typ contains a reference, sequence or string (all the + # things that are garbage-collected) result = searchTypeFor(typ, isGBCRef) proc isTyRef(t: PType): bool = @@ -868,11 +868,12 @@ proc typeAllowedAux(marker: var TIntSet, typ: PType, kind: TSymKind): bool = for i in countup(0, sonsLen(t) - 1): result = typeAllowedAux(marker, t.sons[i], kind) if not result: break - of tyObject: + of tyObject: + if kind == skConst: return false for i in countup(0, sonsLen(t) - 1): - result = typeAllowedAux(marker, t.sons[i], skVar) - if not result: break - if result and t.n != nil: result = typeAllowedNode(marker, t.n, skVar) + result = typeAllowedAux(marker, t.sons[i], kind) + if not result: break + if result and t.n != nil: result = typeAllowedNode(marker, t.n, kind) proc typeAllowed(t: PType, kind: TSymKind): bool = var marker = InitIntSet() diff --git a/lib/pure/actors.cfg b/lib/pure/actors.cfg new file mode 100644 index 000000000..c6bb9c545 --- /dev/null +++ b/lib/pure/actors.cfg @@ -0,0 +1,3 @@ +# to shut up the tester: +--threads:on + diff --git a/tests/accept/run/tactiontable.nim b/tests/accept/run/tactiontable.nim index 6fe39359c..e2f19a099 100644 --- a/tests/accept/run/tactiontable.nim +++ b/tests/accept/run/tactiontable.nim @@ -16,7 +16,7 @@ proc action3(arg: string) = proc action4(arg: string) = echo "action 4 ", arg -const +var actionTable = { "A": action1, "B": action2, diff --git a/tests/reject/tactiontable2.nim b/tests/reject/tactiontable2.nim new file mode 100644 index 000000000..dbfa42f18 --- /dev/null +++ b/tests/reject/tactiontable2.nim @@ -0,0 +1,28 @@ +discard """ + line: 21 + errormsg: "invalid type: 'TTable'" +""" + +import tables + +proc action1(arg: string) = + echo "action 1 ", arg + +proc action2(arg: string) = + echo "action 2 ", arg + +proc action3(arg: string) = + echo "action 3 ", arg + +proc action4(arg: string) = + echo "action 4 ", arg + +const + actionTable = { + "A": action1, + "B": action2, + "C": action3, + "D": action4}.toTable + +actionTable["C"]("arg") + diff --git a/todo.txt b/todo.txt index b47d4958e..8415973b9 100755 --- a/todo.txt +++ b/todo.txt @@ -19,6 +19,7 @@ version 0.9.0 --> solve by implicit conversion from varargs to openarray - change overloading resolution - implement closures; implement proper coroutines +- implement ``partial`` pragma for partial evaluation - implicit invokation of `items` seems nice - we need to support iteration of 2 different data structures in parallel - make exceptions compatible with C++ exceptions -- cgit 1.4.1-2-gfad0 '>100</a> <a id='n101' href='#n101'>101</a> <a id='n102' href='#n102'>102</a> <a id='n103' href='#n103'>103</a> <a id='n104' href='#n104'>104</a> <a id='n105' href='#n105'>105</a> <a id='n106' href='#n106'>106</a> <a id='n107' href='#n107'>107</a> <a id='n108' href='#n108'>108</a> <a id='n109' href='#n109'>109</a> <a id='n110' href='#n110'>110</a> <a id='n111' href='#n111'>111</a> <a id='n112' href='#n112'>112</a> <a id='n113' href='#n113'>113</a> <a id='n114' href='#n114'>114</a> <a id='n115' href='#n115'>115</a> <a id='n116' href='#n116'>116</a> <a id='n117' href='#n117'>117</a> <a id='n118' href='#n118'>118</a> <a id='n119' href='#n119'>119</a> <a id='n120' href='#n120'>120</a> <a id='n121' href='#n121'>121</a> <a id='n122' href='#n122'>122</a> <a id='n123' href='#n123'>123</a> <a id='n124' href='#n124'>124</a> <a id='n125' href='#n125'>125</a> <a id='n126' href='#n126'>126</a> <a id='n127' href='#n127'>127</a> <a id='n128' href='#n128'>128</a> <a id='n129' href='#n129'>129</a> <a id='n130' href='#n130'>130</a> <a id='n131' href='#n131'>131</a> <a id='n132' href='#n132'>132</a> <a id='n133' href='#n133'>133</a> <a id='n134' href='#n134'>134</a> <a id='n135' href='#n135'>135</a> <a id='n136' href='#n136'>136</a> <a id='n137' href='#n137'>137</a> <a id='n138' href='#n138'>138</a> <a id='n139' href='#n139'>139</a> <a id='n140' href='#n140'>140</a> <a id='n141' href='#n141'>141</a> <a id='n142' href='#n142'>142</a> <a id='n143' href='#n143'>143</a> <a id='n144' href='#n144'>144</a> <a id='n145' href='#n145'>145</a> <a id='n146' href='#n146'>146</a> <a id='n147' href='#n147'>147</a> <a id='n148' href='#n148'>148</a> <a id='n149' href='#n149'>149</a> <a id='n150' href='#n150'>150</a> <a id='n151' href='#n151'>151</a> <a id='n152' href='#n152'>152</a> <a id='n153' href='#n153'>153</a> <a id='n154' href='#n154'>154</a> <a id='n155' href='#n155'>155</a> <a id='n156' href='#n156'>156</a> <a id='n157' href='#n157'>157</a> <a id='n158' href='#n158'>158</a> <a id='n159' href='#n159'>159</a> <a id='n160' href='#n160'>160</a> <a id='n161' href='#n161'>161</a> <a id='n162' href='#n162'>162</a> <a id='n163' href='#n163'>163</a> <a id='n164' href='#n164'>164</a> <a id='n165' href='#n165'>165</a> <a id='n166' href='#n166'>166</a> <a id='n167' href='#n167'>167</a> <a id='n168' href='#n168'>168</a> <a id='n169' href='#n169'>169</a> <a id='n170' href='#n170'>170</a> <a id='n171' href='#n171'>171</a> <a id='n172' href='#n172'>172</a> <a id='n173' href='#n173'>173</a> <a id='n174' href='#n174'>174</a> <a id='n175' href='#n175'>175</a> <a id='n176' href='#n176'>176</a> <a id='n177' href='#n177'>177</a> <a id='n178' href='#n178'>178</a> <a id='n179' href='#n179'>179</a> <a id='n180' href='#n180'>180</a> <a id='n181' href='#n181'>181</a> <a id='n182' href='#n182'>182</a> <a id='n183' href='#n183'>183</a> <a id='n184' href='#n184'>184</a> <a id='n185' href='#n185'>185</a> <a id='n186' href='#n186'>186</a> <a id='n187' href='#n187'>187</a> <a id='n188' href='#n188'>188</a> <a id='n189' href='#n189'>189</a> <a id='n190' href='#n190'>190</a> <a id='n191' href='#n191'>191</a> <a id='n192' href='#n192'>192</a> <a id='n193' href='#n193'>193</a> <a id='n194' href='#n194'>194</a> <a id='n195' href='#n195'>195</a> <a id='n196' href='#n196'>196</a> <a id='n197' href='#n197'>197</a> <a id='n198' href='#n198'>198</a> <a id='n199' href='#n199'>199</a> <a id='n200' href='#n200'>200</a> <a id='n201' href='#n201'>201</a> <a id='n202' href='#n202'>202</a> <a id='n203' href='#n203'>203</a> <a id='n204' href='#n204'>204</a> <a id='n205' href='#n205'>205</a> <a id='n206' href='#n206'>206</a> <a id='n207' href='#n207'>207</a> <a id='n208' href='#n208'>208</a> <a id='n209' href='#n209'>209</a> <a id='n210' href='#n210'>210</a> <a id='n211' href='#n211'>211</a> <a id='n212' href='#n212'>212</a> <a id='n213' href='#n213'>213</a> <a id='n214' href='#n214'>214</a> <a id='n215' href='#n215'>215</a> <a id='n216' href='#n216'>216</a> <a id='n217' href='#n217'>217</a> <a id='n218' href='#n218'>218</a> <a id='n219' href='#n219'>219</a> <a id='n220' href='#n220'>220</a> <a id='n221' href='#n221'>221</a> <a id='n222' href='#n222'>222</a> <a id='n223' href='#n223'>223</a> <a id='n224' href='#n224'>224</a> <a id='n225' href='#n225'>225</a> <a id='n226' href='#n226'>226</a> <a id='n227' href='#n227'>227</a> <a id='n228' href='#n228'>228</a> <a id='n229' href='#n229'>229</a> <a id='n230' href='#n230'>230</a> <a id='n231' href='#n231'>231</a> <a id='n232' href='#n232'>232</a> <a id='n233' href='#n233'>233</a> <a id='n234' href='#n234'>234</a> <a id='n235' href='#n235'>235</a> <a id='n236' href='#n236'>236</a> <a id='n237' href='#n237'>237</a> <a id='n238' href='#n238'>238</a> <a id='n239' href='#n239'>239</a> <a id='n240' href='#n240'>240</a> <a id='n241' href='#n241'>241</a> </pre></td> <td class='lines'><pre><code>