diff options
| author | Araq <rumpf_a@web.de> | 2012-12-09 15:53:59 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2012-12-09 15:53:59 +0100 |
| commit | f96ec25ed26cc8868adba6c61af037056049e6be (patch) | |
| tree | dea28ebddf9a9d55a753b4e94540aed5095fdc75 | |
| parent | 654a99266f4c771ad5c2f0d7fe1f522f85279f80 (diff) | |
| download | Nim-f96ec25ed26cc8868adba6c61af037056049e6be.tar.gz | |
made some tests green; some small bugfixes
| -rwxr-xr-x | compiler/semtypes.nim | 2 | ||||
| -rwxr-xr-x | doc/manual.txt | 2 | ||||
| -rw-r--r-- | packages/docutils/rstgen.nim | 4 | ||||
| -rw-r--r-- | tests/patterns/tpartial.nim | 2 | ||||
| -rw-r--r-- | tests/reject/tenummix.nim | 2 | ||||
| -rwxr-xr-x | todo.txt | 1 |
6 files changed, 6 insertions, 7 deletions
diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim index 3da2a95b7..3ad275601 100755 --- a/compiler/semtypes.nim +++ b/compiler/semtypes.nim @@ -798,7 +798,7 @@ proc semTypeExpr(c: PContext, n: PNode): PType = proc freshType(res, prev: PType): PType {.inline.} = if prev.isNil: - result = copyType(result, result.owner, keepId=false) + result = copyType(res, res.owner, keepId=false) else: result = res diff --git a/doc/manual.txt b/doc/manual.txt index da66833ab..6e61395e3 100755 --- a/doc/manual.txt +++ b/doc/manual.txt @@ -2408,7 +2408,7 @@ simplicity (they require specialized semantic checking):: is, of, echo, shallowCopy, getAst Thus they act more like keywords than like ordinary identifiers; unlike a -keyword however, a redefinition may `shadow`:id: the definition in +keyword however, a redefinition may `shadow`:idx: the definition in the ``system`` module. diff --git a/packages/docutils/rstgen.nim b/packages/docutils/rstgen.nim index 492322f6f..92bd20cf8 100644 --- a/packages/docutils/rstgen.nim +++ b/packages/docutils/rstgen.nim @@ -474,8 +474,8 @@ proc renderRstToOut(d: PDoc, n: PRstNode, result: var string) = of rnTableRow: if len(n) >= 1: if d.target == outLatex: - var tmp = "" - renderRstToOut(d, n.sons[0], tmp) + #var tmp = "" + renderRstToOut(d, n.sons[0], result) for i in countup(1, len(n) - 1): result.add(" & ") renderRstToOut(d, n.sons[i], result) diff --git a/tests/patterns/tpartial.nim b/tests/patterns/tpartial.nim index 1a5b1a953..fdaa3414a 100644 --- a/tests/patterns/tpartial.nim +++ b/tests/patterns/tpartial.nim @@ -1,5 +1,5 @@ discard """ - output: '''-1''' + output: '''-2''' """ proc p(x, y: int; cond: bool): int = diff --git a/tests/reject/tenummix.nim b/tests/reject/tenummix.nim index 8a2a19c1e..ec99a2b6a 100644 --- a/tests/reject/tenummix.nim +++ b/tests/reject/tenummix.nim @@ -1,6 +1,6 @@ discard """ file: "system.nim" - line: 663 + line: 669 errormsg: "type mismatch" """ diff --git a/todo.txt b/todo.txt index 141acfa93..b162812bc 100755 --- a/todo.txt +++ b/todo.txt @@ -6,7 +6,6 @@ version 0.9.2 * test generic iterators - fix closure bug finally - fix marshal bug -- make PDF generation of the docs work again version 0.9.X |