@ is a sigil-like operator
This commit is contained in:
parent
3628731064
commit
959e370ae9
9 changed files with 119 additions and 157 deletions
|
|
@ -4,6 +4,22 @@ discard """
|
|||
"""
|
||||
# Test operator precedence:
|
||||
|
||||
template `@` (x: expr): expr {.immediate.} = self.x
|
||||
template `@!` (x: expr): expr {.immediate.} = x
|
||||
template `===` (x: expr): expr {.immediate.} = x
|
||||
|
||||
type
|
||||
TO = object
|
||||
x: int
|
||||
TA = tuple[a, b: int, obj: TO]
|
||||
|
||||
proc init(self: var TA): string =
|
||||
@a = 3
|
||||
=== @b = 4
|
||||
@obj.x = 4
|
||||
@! === result = "abc"
|
||||
result = @b.`$`
|
||||
|
||||
assert 3+5*5-2 == 28- -26-28
|
||||
|
||||
proc `^-` (x, y: int): int =
|
||||
|
|
@ -12,6 +28,11 @@ proc `^-` (x, y: int): int =
|
|||
|
||||
assert 34 ^- 6 ^- 2 == 30
|
||||
assert 34 - 6 - 2 == 26
|
||||
|
||||
|
||||
var s: TA
|
||||
assert init(s) == "4"
|
||||
|
||||
echo "done"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -57,8 +57,8 @@ type
|
|||
pkBackRef, ## $i --> Internal DSL: backref(i)
|
||||
pkBackRefIgnoreCase,
|
||||
pkBackRefIgnoreStyle,
|
||||
pkSearch, ## @a --> Internal DSL: @a
|
||||
pkCapturedSearch, ## {@} a --> Internal DSL: @@a
|
||||
pkSearch, ## @a --> Internal DSL: !*a
|
||||
pkCapturedSearch, ## {@} a --> Internal DSL: !*\a
|
||||
pkRule, ## a <- b
|
||||
pkList, ## a, b
|
||||
pkStartAnchor ## ^ --> Internal DSL: startAnchor()
|
||||
|
|
@ -212,13 +212,13 @@ proc `*`*(a: TPeg): TPeg {.rtl, extern: "npegsGreedyRep".} =
|
|||
result.kind = pkGreedyRep
|
||||
result.sons = @[a]
|
||||
|
||||
proc `@`*(a: TPeg): TPeg {.rtl, extern: "npegsSearch".} =
|
||||
proc `!*`*(a: TPeg): TPeg {.rtl, extern: "npegsSearch".} =
|
||||
## constructs a "search" for the PEG `a`
|
||||
result.kind = pkSearch
|
||||
result.sons = @[a]
|
||||
|
||||
proc `@@`*(a: TPeg): TPeg {.rtl,
|
||||
extern: "npgegsCapturedSearch".} =
|
||||
proc `!*\`*(a: TPeg): TPeg {.rtl,
|
||||
extern: "npgegsCapturedSearch".} =
|
||||
## constructs a "captured search" for the PEG `a`
|
||||
result.kind = pkCapturedSearch
|
||||
result.sons = @[a]
|
||||
|
|
@ -1484,10 +1484,10 @@ proc primary(p: var TPegParser): TPeg =
|
|||
return !primary(p)
|
||||
of tkAt:
|
||||
getTok(p)
|
||||
return @primary(p)
|
||||
return !*primary(p)
|
||||
of tkCurlyAt:
|
||||
getTok(p)
|
||||
return @@primary(p).token(p)
|
||||
return !*\primary(p).token(p)
|
||||
else: nil
|
||||
case p.tok.kind
|
||||
of tkIdentifier:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue