Update to compile under J* 1.9

Author: bamless

pulsar/errors/buffered_reporter.jsr

@@ -6,7 +6,7 @@ import pulsar.errors.reporter for IReporter, Severity
 //  - `formatter`: an object that provides a method format(pulsar.errors.Severity, String, parse.token.Token) -> String
 //  - `writer`: an object that provides a method write(string) -> void
 class BufferedReporter is IReporter
-    fun new(formatter, writer)
+    construct(formatter, writer)
         this._formatter = formatter
         this._writer = writer
         this._errors = []

pulsar/errors/pretty_formatter.jsr

@@ -23,7 +23,7 @@ class PrettyFormatter
         errorBuilder.add("\n")
 
         for var i = 0; i < colStart; i += 1
-            errorBuilder.add("\t" if line.charAt(i) == char("\t") else " ")
+            errorBuilder.add("\t" if line.charAt(i) == std.char("\t") else " ")
         end
 
         errorBuilder.add("^")

pulsar/opt_parse.jsr

@@ -81,7 +81,7 @@ static fun popn(stack, num)
 end
 
 class OptParser
-    fun new(usage, description, options)
+    construct(usage, description, options)
         this._options = options
         this._optMap = buildMapFromOptions(options)
         this._helpMsg = buildHelpMessage(usage, description, options)
@@ -156,7 +156,7 @@ class OptParser
 end
 
 class Option
-    fun new(long, short, description, args=0, argNames=null, default=null, required=false)
+    construct(long, short, description, args=0, argNames=null, default=null, required=false)
         assert(#long > 1, "Long option must have length greater than one", InvalidArgException)
         assert(#short == 1, "Short option must have length equal to one", InvalidArgException)
         assert(args == 0 or args == #argNames, "Not enough argument names given", InvalidArgException)

pulsar/parse/ast.jsr

@@ -18,7 +18,7 @@ class Stmt is Node end
 class Expr is Node end
 
 class AstModule is Node
-    fun new(statements)
+    construct(statements)
         this.statements = statements
     end
 
@@ -32,7 +32,7 @@ class AstModule is Node
 end
 
 static class Decl is Stmt
-    fun new()
+    construct()
         this._static = false
     end
 
@@ -46,7 +46,7 @@ static class Decl is Stmt
 end
 
 class FuncDecl is Decl
-    fun new(funTok, name, leftBracket, arguments, defaults, vararg, rightBracket, body)
+    construct(funTok, name, leftBracket, arguments, defaults, vararg, rightBracket, body)
         super()
         this.funTok = funTok
         this.name = name
@@ -68,7 +68,7 @@ class FuncDecl is Decl
 end
 
 class NativeDecl is Decl
-    fun new(nativeTok, name, leftBracket, arguments, defaults, vararg, rightBracket)
+    construct(nativeTok, name, leftBracket, arguments, defaults, vararg, rightBracket)
         super()
         this.nativeTok = nativeTok
         this.name = name
@@ -89,7 +89,7 @@ class NativeDecl is Decl
 end
 
 class ClassDecl is Decl
-    fun new(classTok, name, superClass, methods)
+    construct(classTok, name, superClass, methods)
         super()
         this.classTok = classTok
         this.name = name
@@ -107,7 +107,7 @@ class ClassDecl is Decl
 end
 
 class VarDecl is Decl
-    fun new(varTok, names, equal, init, unpack)
+    construct(varTok, names, equal, init, unpack)
         super()
         this.varTok = varTok
         this.names = names
@@ -126,7 +126,7 @@ class VarDecl is Decl
 end
 
 class BlockStmt is Stmt
-    fun new(statements)
+    construct(statements)
         this.statements = statements
     end
 
@@ -140,7 +140,7 @@ class BlockStmt is Stmt
 end
 
 class IfStmt is Stmt
-    fun new(ifTok, cond, thenBody, elseBody)
+    construct(ifTok, cond, thenBody, elseBody)
         this.ifTok = ifTok
         this.cond = cond
         this.thenBody = thenBody
@@ -157,7 +157,7 @@ class IfStmt is Stmt
 end
 
 class ForStmt is Stmt
-    fun new(forTok, init, cond, action, body)
+    construct(forTok, init, cond, action, body)
         this.forTok = forTok
         this.init = init
         this.cond = cond
@@ -175,7 +175,7 @@ class ForStmt is Stmt
 end
 
 class ForEachStmt is Stmt
-    fun new(forTok, variable, inTok, iter, body)
+    construct(forTok, variable, inTok, iter, body)
         this.forTok = forTok
         this.variable, this.iter = variable, iter
         this.inTok = inTok
@@ -192,7 +192,7 @@ class ForEachStmt is Stmt
 end
 
 class WhileStmt is Stmt
-    fun new(whileTok, cond, body)
+    construct(whileTok, cond, body)
         this.whileTok = whileTok
         this.cond = cond
         this.body = body
@@ -208,7 +208,7 @@ class WhileStmt is Stmt
 end
 
 class ReturnStmt is Stmt
-    fun new(returnTok, expr)
+    construct(returnTok, expr)
         this.returnTok = returnTok
         this.expr = expr
     end
@@ -223,7 +223,7 @@ class ReturnStmt is Stmt
 end
 
 class ImportStmt is Stmt
-    fun new(importTok, modules, asName, names)
+    construct(importTok, modules, asName, names)
         this.importTok = importTok
         this.modules = modules
         this.asName = asName
@@ -240,7 +240,7 @@ class ImportStmt is Stmt
 end
 
 class TryStmt is Stmt
-    fun new(tokTry, tryBlock, excepts, ensureBlock)
+    construct(tokTry, tryBlock, excepts, ensureBlock)
         this.tokTry = tokTry
         this.tryBlock = tryBlock
         this.excepts = excepts
@@ -257,7 +257,7 @@ class TryStmt is Stmt
 end
 
 class ExceptStmt is Stmt
-    fun new(exceptTok, expression, name, body)
+    construct(exceptTok, expression, name, body)
         this.exceptTok = exceptTok
         this.expression = expression
         this.name = name
@@ -274,7 +274,7 @@ class ExceptStmt is Stmt
 end
 
 class RaiseStmt is Stmt
-    fun new(raiseTok, expression)
+    construct(raiseTok, expression)
         this.raiseTok = raiseTok
         this.expression = expression
     end
@@ -289,7 +289,7 @@ class RaiseStmt is Stmt
 end
 
 class WithStmt is Stmt
-    fun new(withTok, expression, name, body)
+    construct(withTok, expression, name, body)
         this.withTok = withTok
         this.expression = expression
         this.name = name
@@ -306,7 +306,7 @@ class WithStmt is Stmt
 end
 
 class BreakStmt is Stmt
-    fun new(token)
+    construct(token)
         this.token = token
     end
 
@@ -320,7 +320,7 @@ class BreakStmt is Stmt
 end
 
 class ContinueStmt is Stmt
-    fun new(token)
+    construct(token)
         this.token = token
     end
 
@@ -334,7 +334,7 @@ class ContinueStmt is Stmt
 end
 
 class AssignmentExpr is Expr
-    fun new(lvals, equal, rval)
+    construct(lvals, equal, rval)
         this.lvals = lvals
         this.equal = equal
         this.rval = rval
@@ -350,7 +350,7 @@ class AssignmentExpr is Expr
 end
 
 class CompoundAssExpr is Expr
-    fun new(lval, op, rval)
+    construct(lval, op, rval)
         this.lval = lval
         this.op = op
         this.rval = rval
@@ -366,7 +366,7 @@ class CompoundAssExpr is Expr
 end
 
 class BinaryExpr is Expr
-    fun new(l, op, r)
+    construct(l, op, r)
         this.op = op
         this.l, this.r = l ,r
     end
@@ -381,7 +381,7 @@ class BinaryExpr is Expr
 end
 
 class UnaryExpr is Expr
-    fun new(op, operand)
+    construct(op, operand)
         this.op = op
         this.operand = operand
     end
@@ -396,7 +396,7 @@ class UnaryExpr is Expr
 end
 
 class ExponentExpr is Expr
-    fun new(base, pow, exponent)
+    construct(base, pow, exponent)
         this.base = base
         this.pow = pow
         this.exponent = exponent
@@ -412,7 +412,7 @@ class ExponentExpr is Expr
 end
 
 class TernaryExpr is Expr
-    fun new(thenExp, ifTok, cond, elseTok, elseExp)
+    construct(thenExp, ifTok, cond, elseTok, elseExp)
         this.ifTok, this.elseTok = ifTok, elseTok
         this.cond = cond
         this.thenExp = thenExp
@@ -429,7 +429,7 @@ class TernaryExpr is Expr
 end
 
 class FuncLit is Expr
-    fun new(funTok, leftBracket, arguments, defaults, vararg, rightBracket, body)
+    construct(funTok, leftBracket, arguments, defaults, vararg, rightBracket, body)
         this.funTok = funTok
         this.name = null
         this.leftBracket = leftBracket
@@ -450,7 +450,7 @@ class FuncLit is Expr
 end
 
 class AttributeExpr is Expr
-    fun new(l, dot, name)
+    construct(l, dot, name)
         this.l, this.dot, this.name = l, dot, name
     end
 
@@ -464,7 +464,7 @@ class AttributeExpr is Expr
 end
 
 class CallExpr is Expr
-    fun new(l, leftBracket, expressions, rightBracket, isUnpack=false)
+    construct(l, leftBracket, expressions, rightBracket, isUnpack=false)
         this.l = l
         this.leftBracket = leftBracket
         this.expressions = expressions
@@ -482,7 +482,7 @@ class CallExpr is Expr
 end
 
 class ArrayAccessExpr is Expr
-    fun new(l, leftBracket, expression, rightBracket)
+    construct(l, leftBracket, expression, rightBracket)
         this.l = l
         this.leftBracket = leftBracket
         this.expression = expression
@@ -499,7 +499,7 @@ class ArrayAccessExpr is Expr
 end
 
 class NumLit is Expr
-    fun new(num)
+    construct(num)
         this.num = num
     end
 
@@ -513,7 +513,7 @@ class NumLit is Expr
 end
 
 class StringLit is Expr
-    fun new(str)
+    construct(str)
         this.str = str
     end
 
@@ -527,7 +527,7 @@ class StringLit is Expr
 end
 
 class BoolLit is Expr
-    fun new(bool)
+    construct(bool)
         this.bool = bool
     end
 
@@ -541,7 +541,7 @@ class BoolLit is Expr
 end
 
 class NullLit is Expr
-    fun new(nil)
+    construct(nil)
         this.nil = nil
     end
 
@@ -555,7 +555,7 @@ class NullLit is Expr
 end
 
 class VarLit is Expr
-    fun new(id)
+    construct(id)
         this.id = id
     end
 
@@ -569,7 +569,7 @@ class VarLit is Expr
 end
 
 class SuperLit is Expr
-    fun new(superTok, name, leftBracket, arguments, rightBracket, isUnpack = false)
+    construct(superTok, name, leftBracket, arguments, rightBracket, isUnpack = false)
         this.superTok = superTok
         this.name = name
         this.leftBracket = leftBracket
@@ -588,7 +588,7 @@ class SuperLit is Expr
 end
 
 class ListLit is Expr
-    fun new(leftBracket, expressions, rightBracket)
+    construct(leftBracket, expressions, rightBracket)
         this.leftBracket = leftBracket
         this.expressions = expressions
         this.rightBracket = rightBracket
@@ -604,7 +604,7 @@ class ListLit is Expr
 end
 
 class TupleLit is Expr
-    fun new(expressions, leftBracket=null, rightBracket=null)
+    construct(expressions, leftBracket=null, rightBracket=null)
         this.expressions = expressions
         this.leftBracket, this.rightBracket = leftBracket, rightBracket
     end
@@ -619,13 +619,13 @@ class TupleLit is Expr
 end
 
 class TableEntry
-    fun new(key, val)
+    construct(key, val)
         this.key, this.val = key, val
     end
 end
 
 class TableLit is Expr
-    fun new(leftBracket, entries, rightBracket)
+    construct(leftBracket, entries, rightBracket)
         this.leftBracket = leftBracket
         this.entries = entries
         this.rightBracket = rightBracket

pulsar/parse/lexer.jsr

@@ -34,48 +34,48 @@ static var KEYWORDS = {
 }
 
 static var Char = Enum{
-    .nul     : char('\0'),
-    .zero    : char('0'),
-    .nine    : char('9'),
-    .a       : char('a'),
-    .e       : char('e'),
-    .f       : char('f'),
-    .x       : char('x'),
-    .z       : char('z'),
-    .A       : char('A'),
-    .Z       : char('Z'),
-    .hash    : char('#'),
-    .bang    : char('!'),
-    .lparen  : char('('),
-    .rparen  : char(')'),
-    .semicol : char(';'),
-    .colon   : char(':'),
-    .pipe    : char('|'),
-    .amper   : char('&'),
-    .tilde   : char('~'),
-    .comma   : char(','),
-    .lsquare : char('['),
-    .rsquare : char(']'),
-    .lcurly  : char('{'),
-    .rcurly  : char('}'),
-    .uparrow : char('^'),
-    .quote   : char("'"),
-    .dquote  : char('"'),
-    .minus   : char('-'),
-    .plus    : char('+'),
-    .star    : char('*'),
-    .slash   : char('/'),
-    .perc    : char('%'),
-    .lt      : char('<'),
-    .gt      : char('>'),
-    .eq      : char('='),
-    .under   : char('_'),
-    .dot     : char('.'),
-    .bslash  : char('\\'),
-    .space   : char(' '),
-    .tab     : char('\t'),
-    .nl      : char('\n'),
-    .cr      : char('\r')
+    .nul     : std.char('\0'),
+    .zero    : std.char('0'),
+    .nine    : std.char('9'),
+    .a       : std.char('a'),
+    .e       : std.char('e'),
+    .f       : std.char('f'),
+    .x       : std.char('x'),
+    .z       : std.char('z'),
+    .A       : std.char('A'),
+    .Z       : std.char('Z'),
+    .hash    : std.char('#'),
+    .bang    : std.char('!'),
+    .lparen  : std.char('('),
+    .rparen  : std.char(')'),
+    .semicol : std.char(';'),
+    .colon   : std.char(':'),
+    .pipe    : std.char('|'),
+    .amper   : std.char('&'),
+    .tilde   : std.char('~'),
+    .comma   : std.char(','),
+    .lsquare : std.char('['),
+    .rsquare : std.char(']'),
+    .lcurly  : std.char('{'),
+    .rcurly  : std.char('}'),
+    .uparrow : std.char('^'),
+    .quote   : std.char("'"),
+    .dquote  : std.char('"'),
+    .minus   : std.char('-'),
+    .plus    : std.char('+'),
+    .star    : std.char('*'),
+    .slash   : std.char('/'),
+    .perc    : std.char('%'),
+    .lt      : std.char('<'),
+    .gt      : std.char('>'),
+    .eq      : std.char('='),
+    .under   : std.char('_'),
+    .dot     : std.char('.'),
+    .bslash  : std.char('\\'),
+    .space   : std.char(' '),
+    .tab     : std.char('\t'),
+    .nl      : std.char('\n'),
+    .cr      : std.char('\r')
 }
 
 static fun isAlpha(c)
@@ -97,7 +97,7 @@ end
 // Lexer for the J* language
 // Mimicst the structure of the c lexer
 class Lexer
-    fun new(src)
+    construct(src)
         this._src = src
         this._ptr = 0
         this._line = 1

pulsar/parse/parser.jsr

@@ -152,7 +152,7 @@ end
 // Recursive descent parser for the J* language
 // Basically mimics the C parser
 class Parser
-    fun new(sourceFile, errorCallback)
+    construct(sourceFile, errorCallback)
         typeAssert(sourceFile, SourceFile, "sourceFile")
         typeAssert(errorCallback, Function, "errorCallback")
         this._lex = Lexer(sourceFile)

pulsar/parse/source.jsr

@@ -4,7 +4,7 @@ import re
 // Returns a list containing the offsets of all newlines present in the string
 static fun getLines(string)
     // Capture all newlines offsets with `()` syntax
-    var lines = re.gmatch(string, "()\n")
+    var lines = re.matchAll(string, "()\n")
     // Add syntethic newlines before the start and at the end
     lines.insert(0, -1)
     lines.insert(#lines, #string)
@@ -13,7 +13,7 @@ end
 
 // Class that represent a single J* source file
 class SourceFile
-    fun new(path, src)
+    construct(path, src)
         this.path = path
         this._src = src
         this._lines = getLines(src)
@@ -24,7 +24,7 @@ class SourceFile
     fun lineAt(off)
         var lo, hi = 0, #this._lines - 1
         while lo < hi - 1
-            var m = lo + int((hi - lo) / 2)
+            var m = lo + std.int((hi - lo) / 2)
             if off > this._lines[m]
                 lo = m
             else

pulsar/parse/token.jsr

@@ -88,7 +88,7 @@ var Type = Enum(
 
 // A J* lexical token
 class Token
-    fun new(source, type, start, length)
+    construct(source, type, start, length)
         this.type = type
         this._source = source
         this._start = start

pulsar/passes/check_access.jsr

@@ -12,7 +12,7 @@ static fun isInstanceAttribute(expr)
 end
 
 class AccessChecker is PassVisitor
-    fun new(reporter)
+    construct(reporter)
         super(reporter)
         this._classDepth = 0
         this._functions = []

pulsar/passes/check_return.jsr

@@ -3,7 +3,7 @@ import pulsar.passes.pass_visitor for PassVisitor
 
 // Stores information about an encountered function
 static class FuncItem
-    fun new(node)
+    construct(node)
         this._node = node
         this._returns = false
     end
@@ -18,7 +18,7 @@ static class FuncItem
 end
 
 class ReturnChecker is PassVisitor
-    fun new(reporter)
+    construct(reporter)
         super(reporter)
         this._functions = []
     end

pulsar/passes/check_semantics.jsr

@@ -20,7 +20,7 @@ end
 //   - return statements outside of a function or in a constructor
 //   - illegal unpacking declarations/assignments (either unbalanced, or using an invalid type)
 class SemanticChecker is PassVisitor
-    fun new(reporter)
+    construct(reporter)
         super(reporter)
         this._scopeDepth = 0
         this._classDepth = 0

pulsar/passes/check_unreach.jsr

@@ -1,7 +1,7 @@
 import pulsar.passes.pass_visitor for PassVisitor
 
 class UnreachableCodeChecker is PassVisitor
-    fun new(reporter)
+    construct(reporter)
         super(reporter)
         this._loopDepth = 0
     end

pulsar/passes/check_unused.jsr

@@ -5,7 +5,7 @@ import pulsar.passes.symtable for SymbolTable
 import pulsar.passes.token_utils as token_utils
 
 class UnusedChecker is PassVisitor
-    fun new(reporter, ignoreUnusedArg=false)
+    construct(reporter, ignoreUnusedArg=false)
         super(reporter)
         this._variables = SymbolTable()  // Symbol table of Identifier -> Boolean (usage status)
         this._ignoreUnusedArg = ignoreUnusedArg

pulsar/passes/pass_visitor.jsr

@@ -2,7 +2,7 @@ import pulsar.errors.reporter for Severity
 import pulsar.parse.visitor for Visitor
 
 class PassVisitor is Visitor
-    fun new(reporter)
+    construct(reporter)
         this._reporter = reporter
     end
 

pulsar/passes/resolve_var.jsr

@@ -28,7 +28,7 @@ end
 
 // Stores information about a declared variable
 static class Variable
-    fun new(name, line, scope)
+    construct(name, line, scope)
         this.name = name
         this.line = line
         this.scope = scope
@@ -48,7 +48,7 @@ end
 // It also detects and reports some common errors, such as use before declaration of
 // static globals, possibly uninitialized variables and unused variables
 class VariableResolver is PassVisitor
-    fun new(reporter, ignoreGlobalRedef=false)
+    construct(reporter, ignoreGlobalRedef=false)
         super(reporter)
         this._scopes = SymbolTable()       // Symboltable String (variable name) -> Variable
         this._initialized = SymbolTable()  // Symboltalbe Variable -> Boolean (init status)

pulsar/passes/symtable.jsr

@@ -1,7 +1,7 @@
 // Scoped symbol table
 // Mantains association between a symbol and some data
 class SymbolTable
-    fun new()
+    construct()
         this._scopes = []
     end
 

pulsar/passes/token_utils.jsr

@@ -34,9 +34,9 @@ fun isConstant(token)
     for var i = 0; i < #lexeme; i += 1
         var lexChar = lexeme.charAt(i)
         if !capsEncountered
-            capsEncountered = lexChar >= char("A") and lexChar <= char("Z")
+            capsEncountered = lexChar >= std.char("A") and lexChar <= std.char("Z")
         end
-        if lexChar >= char("a") and lexChar <= char("z")
+        if lexChar >= std.char("a") and lexChar <= std.char("z")
             return false
         end
     end

pulsar/pulsar.jsr

@@ -13,7 +13,7 @@ class Pulsar
     // Construct a new Pulsar object configured with `opts`.
     // `opts` is a set of strings that determines which passes will be run.
     // Valid values for opts are the same as the cli options, and have the same effects.
-    fun new(opts)
+    construct(opts)
         this._opts = opts
     end