Merge pull request #2 from jemc/master

Update for latest ponyc master (explicit partial calls).

Author: sylvanc

peg/_test.pony

@@ -7,7 +7,7 @@ actor Main
         peg_compiler(env)
       else
         let auth = env.root as AmbientAuth
-        let filename = env.args(1)
+        let filename = env.args(1)?
         let p = recover val (JsonParser() / PegParser()).eof() end
         peg_run(p, filename, auth, env.out)
       end
@@ -18,7 +18,7 @@ actor Main
     Run a parser over some source file and print the AST.
     """
     try
-      let source = Source(FilePath(auth, filename))
+      let source = Source(FilePath(auth, filename)?)?
       match recover val p.parse(source) end
       | (_, let r: ASTChild) =>
         out.print(recover val Printer(r) end)
@@ -36,10 +36,10 @@ actor Main
     print the AST.
     """
     try
-      let peg_filename = env.args(1)
-      let target_filename = env.args(2)
+      let peg_filename = env.args(1)?
+      let target_filename = env.args(2)?
       let auth = env.root as AmbientAuth
-      let peg = Source(FilePath(auth, peg_filename))
+      let peg = Source(FilePath(auth, peg_filename)?)?
 
       match recover val PegCompiler(peg) end
       | let p: Parser val =>

peg/ast.pony

@@ -15,4 +15,4 @@ class val AST
   fun size(): USize => children.size()
 
   fun extract(): ASTChild =>
-    try children(0) else NotPresent end
+    try children(0)? else NotPresent end

peg/choice.pony

@@ -33,4 +33,4 @@ class Choice is Parser
     end
     fail
 
-  fun error_msg(): String => try _seq(0).error_msg() else "an empty choice" end
+  fun error_msg(): String => try _seq(0)?.error_msg() else "an empty choice" end

peg/pegcompiler.pony

@@ -41,9 +41,9 @@ primitive PegCompiler
 
     if errors.size() == 0 then
       try
-        (var start: Parser, _) = defs("start")
+        (var start: Parser, _) = defs("start")?
         if defs.contains("hidden") then
-          start = start.hide(defs("hidden")._1)
+          start = start.hide(defs("hidden")?._1)
         end
         return start
       end
@@ -53,11 +53,11 @@ primitive PegCompiler
 
   fun _forward_definition(errors: Array[PegError], defs: Defs, ast: AST) =>
     try
-      let token = ast.children(0) as Token
+      let token = ast.children(0)? as Token
       let ident: String = token.string()
 
       if defs.contains(ident) then
-        (_, let prev) = defs(ident)
+        (_, let prev) = defs(ident)?
         errors.push(DuplicateDefinition(token, prev))
       else
         defs(ident) = (Forward, token)
@@ -66,12 +66,12 @@ primitive PegCompiler
 
   fun _compile_definition(errors: Array[PegError], defs: Defs, ast: AST) =>
     try
-      let ident: String = (ast.children(0) as Token).string()
-      let rule = _compile_expr(errors, defs, ast.children(1))
-      (let p, _) = defs(ident)
+      let ident: String = (ast.children(0)? as Token).string()
+      let rule = _compile_expr(errors, defs, ast.children(1)?)
+      (let p, _) = defs(ident)?
 
       if not p.complete() then
-        let c = ident(0)
+        let c = ident(0)?
         if (c >= 'A') and (c <= 'Z') then
           p() = rule.term(PegLabel(ident))
         else
@@ -93,42 +93,42 @@ primitive PegCompiler
       match node.label()
       | PegChoice =>
         let ast = node as AST
-        var p = _compile_expr(errors, defs, ast.children(0))
+        var p = _compile_expr(errors, defs, ast.children(0)?)
         for i in Range(1, ast.children.size()) do
-          p = p / _compile_expr(errors, defs, ast.children(i))
+          p = p / _compile_expr(errors, defs, ast.children(i)?)
         end
         p
       | PegSeq =>
         let ast = node as AST
-        var p = _compile_expr(errors, defs, ast.children(0))
+        var p = _compile_expr(errors, defs, ast.children(0)?)
         for i in Range(1, ast.children.size()) do
-          p = p * _compile_expr(errors, defs, ast.children(i))
+          p = p * _compile_expr(errors, defs, ast.children(i)?)
         end
         p
       | PegSkip =>
-        -_compile_expr(errors, defs, (node as AST).children(0))
+        -_compile_expr(errors, defs, (node as AST).children(0)?)
       | PegNot =>
-        not _compile_expr(errors, defs, (node as AST).children(0))
+        not _compile_expr(errors, defs, (node as AST).children(0)?)
       | PegAnd =>
-        not not _compile_expr(errors, defs, (node as AST).children(0))
+        not not _compile_expr(errors, defs, (node as AST).children(0)?)
       | PegMany1 =>
-        _compile_expr(errors, defs, (node as AST).children(0)).many1()
+        _compile_expr(errors, defs, (node as AST).children(0)?).many1()
       | PegMany =>
-        _compile_expr(errors, defs, (node as AST).children(0)).many()
+        _compile_expr(errors, defs, (node as AST).children(0)?).many()
       | PegSep1 =>
         let ast = node as AST
-        let sep = _compile_expr(errors, defs, ast.children(1))
-        _compile_expr(errors, defs, ast.children(0)).many1(sep)
+        let sep = _compile_expr(errors, defs, ast.children(1)?)
+        _compile_expr(errors, defs, ast.children(0)?).many1(sep)
       | PegSep =>
         let ast = node as AST
-        let sep = _compile_expr(errors, defs, ast.children(1))
-        _compile_expr(errors, defs, ast.children(0)).many(sep)
+        let sep = _compile_expr(errors, defs, ast.children(1)?)
+        _compile_expr(errors, defs, ast.children(0)?).many(sep)
       | PegOpt =>
-        _compile_expr(errors, defs, (node as AST).children(0)).opt()
+        _compile_expr(errors, defs, (node as AST).children(0)?).opt()
       | PegRange =>
         let ast = node as AST
-        let a = _unescape(ast.children(0) as Token).utf32(0)._1
-        let b = _unescape(ast.children(1) as Token).utf32(0)._1
+        let a = _unescape(ast.children(0)? as Token).utf32(0)?._1
+        let b = _unescape(ast.children(1)? as Token).utf32(0)?._1
         R(a, b)
       | PegIdent =>
         let token = node as Token
@@ -137,7 +137,7 @@ primitive PegCompiler
           errors.push(MissingDefinition(token))
           NoParser
         else
-          defs(ident)._1
+          defs(ident)?._1
         end
       | PegAny =>
         R(' ')

peg/position.pony

@@ -8,7 +8,7 @@ primitive Position
 
     try
       for i in Range(0, offset) do
-        match source.content(i)
+        match source.content(i)?
         | '\r' =>
           line = line + 1
           col = 1
@@ -33,7 +33,7 @@ primitive Position
     let start = ((offset - col) + 1).isize()
     let finish =
       try
-        source.content.find("\n", start)
+        source.content.find("\n", start)?
       else
         source.content.size().isize()
       end
@@ -44,7 +44,7 @@ primitive Position
       let s = String
       try
         for i in Range(0, col - 1) do
-          if line(i) == '\t' then
+          if line(i)? == '\t' then
             s.append("\t")
           else
             s.append(" ")

peg/sequence.pony

@@ -79,4 +79,4 @@ class Sequence is Parser
     (length, Lex)
 
   fun error_msg(): String =>
-    try _seq(0).error_msg() else "an empty sequence" end
+    try _seq(0)?.error_msg() else "an empty sequence" end

peg/unicode.pony

@@ -4,7 +4,7 @@ primitive Unicode is Parser
   =>
     let from = skip_hidden(source, offset, hidden)
     try
-      (let c, let length) = source.content.utf32(from.isize())
+      (let c, let length) = source.content.utf32(from.isize())?
       if c != 0xFFFD then
         return result(source, offset, from, length.usize(), tree)
       end
@@ -28,7 +28,7 @@ class UnicodeRange is Parser
   =>
     let from = skip_hidden(source, offset, hidden)
     try
-      (let c, let length) = source.content.utf32(from.isize())
+      (let c, let length) = source.content.utf32(from.isize())?
       if (c != 0xFFFD) and (c >= _low) and (c <= _hi) then
         return result(source, offset, from, length.usize(), tree)
       end