Skip to content

Commit 965869e

Browse files
authored
Merge branch 'main' into rivet_fmt
2 parents 13a4bd1 + 7974266 commit 965869e

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

lib/rivet/src/token/Kind.ri

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ static kindStrings := [
103103
KindMap(.KwThrow, "throw"),
104104
KindMap(.KwTrait, "trait"),
105105
KindMap(.KwTrue, "true"),
106-
KindMap(.KwUndefined, "undefined"),
107106
KindMap(.KwUnsafe, "unsafe"),
108107
KindMap(.KwWhile, "while")
109108
];
@@ -202,7 +201,6 @@ public enum Kind < traits.Stringable {
202201
KwThrow, // throw
203202
KwTrait, // trait
204203
KwTrue, // true
205-
KwUndefined, // undefined
206204
KwUnsafe, // unsafe
207205
KwWhile, // while
208206
// ==============================
@@ -297,7 +295,6 @@ public func lookup(str: string) -> Kind {
297295
"throw" -> .KwThrow,
298296
"trait" -> .KwTrait,
299297
"true" -> .KwTrue,
300-
"undefined" -> .KwUndefined,
301298
"unsafe" -> .KwUnsafe,
302299
"while" -> .KwWhile,
303300
else -> .Name

rivetc/src/codegen/c.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,14 +333,14 @@ def gen_inst(self, inst):
333333
self.write("--")
334334
elif inst.kind in (InstKind.BitNot, InstKind.BooleanNot, InstKind.Neg):
335335
if inst.kind == InstKind.BooleanNot:
336-
self.write("!(")
336+
self.write("!")
337337
elif inst.kind == InstKind.Neg:
338338
self.write("-")
339339
else:
340340
self.write("~")
341+
self.write("(")
341342
self.gen_expr(inst.args[0])
342-
if inst.kind == InstKind.BooleanNot:
343-
self.write(")")
343+
self.write(")")
344344
elif inst.kind == InstKind.Br:
345345
if len(inst.args) == 1:
346346
self.write(f"goto {inst.args[0].name}")

rivetc/src/token.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ class Kind(Enum):
9797
KwThrow = auto_enum() # throw
9898
KwTrait = auto_enum() # trait
9999
KwTrue = auto_enum() # true
100-
KwUndefined = auto_enum() # undefined
101100
KwUnsafe = auto_enum() # unsafe
102101
KwWhile = auto_enum() # while
103102
# ==============================
@@ -243,7 +242,6 @@ def __str__(self):
243242
Kind.KwThrow: "throw",
244243
Kind.KwTrait: "trait",
245244
Kind.KwTrue: "true",
246-
Kind.KwUndefined: "undefined",
247245
Kind.KwUnsafe: "unsafe",
248246
Kind.KwWhile: "while",
249247
# ==============================

0 commit comments

Comments
 (0)