Merged upstream changes.

This set of changes add the initial files for the bootstrap parser generator, which are in an intermediate dev state.  Catch/throw semi-broken support was also added.  Stack unwinding is not done, so memory leaks occur on throw.

Author: waywardgeek

bind/bind.c

@@ -598,8 +598,8 @@ static void reportEvent(deEvent event) {
   }
   deIdent undefinedIdent = deEventGetUndefinedIdent(event);
   utAssert(undefinedIdent != deIdentNull);
-  deReportError(deExpressionGetLine(deIdentGetFirstExpression(undefinedIdent)),
-     "Undefined identifier %s", deIdentGetName(undefinedIdent));
+  deExpression expression = deBindingGetFirstExpression(binding);
+  deExprError(expression, "Undefined identifier %s", deIdentGetName(undefinedIdent));
 }
 
 // Report errors for any undefined or unbound identifiers that remain, and

bind/bindexpr.c

@@ -1952,6 +1952,12 @@ static void postProcessBoundStatement(deBlock scopeBlock, deBinding binding) {
     selectMatchingCase(scopeBlock, binding);
   } else if (type == DE_STATEMENT_PRINT || type == DE_STATEMENT_THROW) {
     dePostProcessPrintStatement(statement);
+  } else if (type == DE_STATEMENT_IF) {
+    deExpression expression = deStatementGetExpression(statement);
+    deDatatype datatype = deExpressionGetDatatype(expression);
+    if (datatype == deDatatypeNull || deDatatypeGetType(datatype) != DE_TYPE_BOOL) {
+      deExprError(expression, "If statement requires a boolean condition");
+    }
   }
 }
 

bootstrap/Makefile

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+RUNE=../rune
 SRC=\
 rune.rn \
 database/expr.rn \
@@ -21,7 +22,10 @@ database/line.stdout \
 database/root.rn
 
 rune: $(SRC)
-	rune -g rune.rn
+	$(RUNE) -g rune.rn
+
+test: $(SRCS)
+	$(RUNE) -g -t rune.rn
 
 clean:
 	rm -f rune rune.ll rune.log

bootstrap/database/Makefile

@@ -14,7 +14,7 @@
 
 RUNE=../../rune
 
-RUNE_TESTS=bigint block expr function statement value
+RUNE_TESTS=bigint block expr function statement value filepath location
 
 runtests: $(RUNE_TESTS)
 	for test in $(RUNE_TESTS); do "./$$test"; done
@@ -37,5 +37,11 @@ block: block.rn
 function: function.rn
 	$(RUNE) -g function.rn
 
+filepath: filepath.rn
+	$(RUNE) -g filepath.rn
+
+location: location.rn
+	$(RUNE) -g location.rn
+
 clean:
 	rm -f $(RUNE_TESTS) *.ll

bootstrap/database/filepath.rn

@@ -22,6 +22,7 @@ use root
 class Filepath(self, path: string, parent: Filepath?, isPackage: bool) {
   self.sym = Sym.new(path)
   self.isPackage = isPackage
+  self.text = ""  // Call the readFile() method to initialize this.
   getRoot().insertFilepath(self)
   if !isnull(parent) {
     parent!.appendChildFilepath(self)
@@ -53,7 +54,24 @@ class Filepath(self, path: string, parent: Filepath?, isPackage: bool) {
     }
     return path[pos:path.length()]
   }
+
+  // Read the text of the filepath into self.text.
+  // Throws an error if there are any problems.
+  func readFile(self) {
+    file = io.open(self.sym.name, "r")
+    if isnull(file) {
+      throw "Unable to read file ", self.sym.name
+    }
+    self.text = file!.read()
+  }
 }
 
 relation Hashed Root Filepath cascade ("sym")
 relation DoublyLinked Filepath:"Parent" Filepath:"Child" cascade
+
+unittest constructorTest {
+  rootFilepath = Filepath("rootdir", null(Filepath), false)
+  childFilepath = Filepath("test", rootFilepath, true)
+  rootFilepath.destroy()
+  println "passed"
+}

bootstrap/database/location.rn

@@ -0,0 +1,99 @@
+//  Copyright 2023 Google LLC.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This should replace the Line class in the database.  For now, it is local to
+// the parser generator.
+
+use filepath
+
+class Location(self, filepath: Filepath, pos:u32, len: u32, line: u32) {
+  self.pos = pos
+  self.len = len
+  self.line = line
+  filepath.appendLocation(self)
+
+  // Write the line to stdout, with a filename and line number prefix.
+  func dump(self) {
+    filepath = self.filepath
+    assert !isnull(filepath)
+    path = filepath!.getRelativePath()
+    if path.length() > 0 {
+      println "File %s, line %u:" % (path, self.line)
+    }
+    if filepath!.text.length() > 0 {
+      self.printLineAndCarots()
+    }
+  }
+
+  // Like dump(), but prints msg.
+  func error(self, msg) {
+    filepath = self.filepath
+    assert !isnull(filepath)
+    path = filepath!.getRelativePath()
+    if path.length() > 0 {
+      println "File %s, line %u: %s" % (path, self.line, msg)
+    }
+    if filepath!.text.length() > 0 {
+      self.printLineAndCarots()
+    }
+  }
+
+  func printLineAndCarots(self) {
+    start = self.findLineStart()
+    end = self.findLineEnd()
+    println self.filepath!.text[start:end]
+    for i in range(self.pos - start) {
+      print " "
+    }
+    for i in range(self.len) {
+      print "^"
+    }
+    println
+  }
+
+  func findLineStart(self) -> u32 {
+    pos = self.pos
+    while pos != 0 {
+      pos -= 1
+      c = self.filepath!.text[pos]
+      if c == '\n' {
+        return pos + 1
+      }
+    }
+    return 0u32
+  }
+
+  func findLineEnd(self) -> u32 {
+    pos = self.pos
+    while pos < <pos>self.filepath!.text.length() {
+      if self.filepath!.text[pos] == '\n' {
+        return pos
+      }
+      pos += 1
+    }
+    return <pos>self.filepath!.text.length()
+  }
+}
+
+relation DoublyLinked Filepath Location
+
+unittest {
+  rootFilepath = Filepath.new("testdata", null(Filepath), false)
+  filepath = Filepath.new("testdata/hello", rootFilepath, false)
+  location1 = Location(filepath, 0u32, 5u32, 1u32)
+  location2 = Location(filepath, 7u32, 6u32, 1u32)
+  filepath.readFile()
+  location1.dump()
+  location2.dump()
+}

bootstrap/database/location.stdout

@@ -0,0 +1,6 @@
+File testdata/hello, line 1:
+Hello, World!
+^^^^^
+File testdata/hello, line 1:
+Hello, World!
+       ^^^^^^

bootstrap/database/package.rn

@@ -12,10 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use root
-use line
-use filepath
 use bigint
 use datatype
-use value
 use expr
+use filepath
+use line
+use location
+use root
+use value

bootstrap/database/testdata/hello

@@ -0,0 +1 @@
+Hello, World!

bootstrap/database/value.rn

@@ -44,6 +44,7 @@ class Value(self: Value, value: string | bool | Int | Uint | Bigint | Float | Sy
   self.intVal = null(Bigint)
   self.floatVal = 0.0f64
   self.symVal = null(Sym)
+  // We need a tagged union here, but for now we'll just bloat this class.
   typeswitch value {
     string => self.stringVal = value
     bool => self.boolVal = value

bootstrap/parsegen/Makefile

@@ -13,26 +13,32 @@
 # limitations under the License.
 
 RUNE=../../rune
+RNFLAGS=-g -r ..
 
-RUNE_TESTS=parser char lexer
+RUNE_TESTS=char lexer parser token keytab
 
 all: runtests parsergen
 
 runtests: $(RUNE_TESTS)
 	for test in $(RUNE_TESTS); do "./$$test"; done
 
 parsergen: parsergen.rn
-	$(RUNE) -g parsergen.rn
+	$(RUNE) $(RNFLAGS) parsergen.rn
 
 parser: parser.rn lexer.rn char.rn
-	$(RUNE) -g parser.rn
+	$(RUNE) $(RNFLAGS) parser.rn
 
 char: char.rn
-	$(RUNE) -g char.rn
+	$(RUNE) $(RNFLAGS) char.rn
 
 lexer: lexer.rn char.rn
-	$(RUNE) -g lexer.rn
+	$(RUNE) $(RNFLAGS) lexer.rn
+
+token: token.rn
+	$(RUNE) $(RNFLAGS) token.rn
+
+keytab: keytab.rn
+	$(RUNE) -g keytab.rn
 
-clean:
 clean:
 	rm -f $(RUNE_TESTS) *.ll parsergen