Skip to content

Commit ddc131c

Browse files
committed
the parser finally parses 'echo {1,2}' as it should
1 parent b2c358b commit ddc131c

File tree

18 files changed

+26
-38
lines changed

18 files changed

+26
-38
lines changed

compiler/parser.nim

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -255,13 +255,6 @@ proc isUnary(p: TParser): bool =
255255
p.tok.strongSpaceB == 0 and
256256
p.tok.strongSpaceA > 0:
257257
result = true
258-
# versions prior to 0.13.0 used to do this:
259-
when false:
260-
if p.strongSpaces:
261-
result = true
262-
else:
263-
parMessage(p, warnDeprecated,
264-
"will be parsed as unary operator; inconsistent spacing")
265258

266259
proc checkBinary(p: TParser) {.inline.} =
267260
## Check if the current parser token is a binary operator.
@@ -700,12 +693,7 @@ proc primarySuffix(p: var TParser, r: PNode, baseIndent: int): PNode =
700693
result = r
701694

702695
template somePar() =
703-
if p.tok.strongSpaceA > 0:
704-
if p.strongSpaces:
705-
break
706-
else:
707-
parMessage(p, warnDeprecated,
708-
"a [b] will be parsed as command syntax; spacing")
696+
if p.tok.strongSpaceA > 0: break
709697
# progress guaranteed
710698
while p.tok.indent < 0 or
711699
(p.tok.tokType == tkDot and p.tok.indent >= baseIndent):

tests/casestmt/tcomputedgoto.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type
1818
enumA, enumB, enumC, enumD, enumE, enumLast
1919

2020
proc vm() =
21-
var instructions: array [0..100, MyEnum]
21+
var instructions: array[0..100, MyEnum]
2222
instructions[2] = enumC
2323
instructions[3] = enumD
2424
instructions[4] = enumA

tests/constr/tconstr1.nim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ type
1414

1515
proc testSem =
1616
var
17-
things: array [0..1, TComplexRecord] = [
17+
things: array[0..1, TComplexRecord] = [
1818
(s: "hi", x: 69, y: 45, z: 0.0, chars: {'a', 'b', 'c'}),
1919
(s: "hi", x: 69, y: 45, z: 1.0, chars: {'a', 'b', 'c'})]
2020
write(stdout, things[0].x)
2121

2222
const
23-
things: array [0..1, TComplexRecord] = [
23+
things: array[0..1, TComplexRecord] = [
2424
(s: "hi", x: 69, y: 45, z: 0.0, chars: {'a', 'b', 'c'}),
2525
(s: "hi", x: 69, y: 45, z: 1.0)] #ERROR
2626
otherThings = [ # the same

tests/constr/tconstr2.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ type
1212
chars: set[char]]
1313

1414
const
15-
things: array [0..1, TComplexRecord] = [
15+
things: array[0..1, TComplexRecord] = [
1616
(s: "hi", x: 69, y: 45, z: 0.0, chars: {'a', 'b', 'c'}),
1717
(s: "hi", x: 69, y: 45, z: 1.0, chars: {})]
1818
otherThings = [ # the same

tests/macros/tdebugstmt.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ macro debug(n: varargs[untyped]): untyped =
2121
add(result, newCall("writeLine", newIdentNode("stdout"), n[i]))
2222

2323
var
24-
a: array [0..10, int]
24+
a: array[0..10, int]
2525
x = "some string"
2626
a[0] = 42
2727
a[1] = 45

tests/magics/tlowhigh.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ type
88
myEnum = enum e1, e2, e3, e4, e5
99

1010
var
11-
a: array [myEnum, int]
11+
a: array[myEnum, int]
1212

1313
for i in low(a) .. high(a):
1414
a[i] = 0

tests/misc/mvarious.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Test a submodule
22

33
#type
4-
# TStringArr = array [0.. *] of string
4+
# TStringArr = array[0.. *] of string
55

66
proc exportme* = discard

tests/misc/tnew.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ type
99
str: string
1010
le, ri: PNode
1111

12-
TStressTest = ref array [0..45, array [1..45, TNode]]
12+
TStressTest = ref array[0..45, array[1..45, TNode]]
1313

1414
proc finalizer(n: PNode) =
1515
write(stdout, n.data)

tests/misc/tradix.nim

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ type
1313
kind: TRadixNodeKind
1414
TRadixNodeLinear = object of TRadixNode
1515
len: int8
16-
keys: array [0..31, int8]
17-
vals: array [0..31, PRadixNode]
16+
keys: array[0..31, int8]
17+
vals: array[0..31, PRadixNode]
1818

1919
TRadixNodeFull = object of TRadixNode
20-
b: array [0..255, PRadixNode]
20+
b: array[0..255, PRadixNode]
2121
TRadixNodeLeafBits = object of TRadixNode
22-
b: array [0..7, int]
22+
b: array[0..7, int]
2323
TRadixNodeLeafLinear = object of TRadixNode
2424
len: int8
25-
keys: array [0..31, int8]
25+
keys: array[0..31, int8]
2626

2727
var
2828
root: PRadixNode

tests/misc/tstrdesc.nim

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
var
2-
x: array [0..2, int]
2+
x: array[0..2, int]
33

44
x = [0, 1, 2]
55

66
type
77
TStringDesc {.final.} = object
88
len, space: int # len and space without counting the terminating zero
9-
data: array [0..0, char] # for the '\0' character
9+
data: array[0..0, char] # for the '\0' character
1010

1111
var
1212
emptyString {.exportc: "emptyString".}: TStringDesc

tests/misc/tvarnums.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import
88
strutils
99

1010
type
11-
TBuffer = array [0..10, int8]
11+
TBuffer = array[0..10, int8]
1212

1313
proc toVarNum(x: int32, b: var TBuffer) =
1414
# encoding: first bit indicates end of number (0 if at end)

tests/stdlib/tmath2.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ proc TestLoops() =
6464

6565
var
6666
glob: int
67-
a: array [0..5, int]
67+
a: array[0..5, int]
6868

6969
proc main() =
7070
#glob = 0

tests/stdlib/trepr2.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ type
66

77
TPoint {.final.} = object
88
x, y, z: int
9-
s: array [0..1, string]
9+
s: array[0..1, string]
1010
e: TEnum
1111

1212
var

tests/stdlib/tstrset.nim

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ type
77
kind: TRadixNodeKind
88
TRadixNodeLinear = object of TRadixNode
99
len: int8
10-
keys: array [0..31, char]
11-
vals: array [0..31, PRadixNode]
10+
keys: array[0..31, char]
11+
vals: array[0..31, PRadixNode]
1212
TRadixNodeFull = object of TRadixNode
13-
b: array [char, PRadixNode]
13+
b: array[char, PRadixNode]
1414
TRadixNodeLeaf = object of TRadixNode
1515
s: string
1616
PRadixNodeLinear = ref TRadixNodeLinear

tests/threads/tthreadanalysis.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ discard """
99
import os
1010

1111
var
12-
thr: array [0..5, Thread[tuple[a, b: int]]]
12+
thr: array[0..5, Thread[tuple[a, b: int]]]
1313

1414
proc doNothing() = discard
1515

tests/threads/tthreadanalysis2.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ discard """
88
import os
99

1010
var
11-
thr: array [0..5, Thread[tuple[a, b: int]]]
11+
thr: array[0..5, Thread[tuple[a, b: int]]]
1212

1313
proc doNothing() = discard
1414

tests/varres/tvarres3.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var
66
g = 5
77

88
proc p(): var int =
9-
var bla = addr(g) #: array [0..7, int]
9+
var bla = addr(g) #: array[0..7, int]
1010
result = bla[]
1111

1212
p() = 45

tests/vm/tarrayboundeval.nim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ echo myconst, " ", int((KeyMax + 31) / 32)
2525

2626
#bug 1304 or something:
2727

28-
const constArray: array [-3..2, int] = [-3, -2, -1, 0, 1, 2]
28+
const constArray: array[-3..2, int] = [-3, -2, -1, 0, 1, 2]
2929

3030
echo constArray[-2]
3131

0 commit comments

Comments
 (0)