wip

Author: OceanOak

backend/src/BuiltinDarkInternal/Libs/DBs.fs

@@ -33,14 +33,14 @@ let fns : List<BuiltInFn> =
     { name = fn "darkInternalCanvasDBUnlocked" 0
       typeParams = []
       parameters = [ Param.make "canvasID" TUuid "" ]
-      returnType = TList TInt64
+      returnType = TList TUInt64
       description = "Get a list of unlocked DBs"
       fn =
         (function
         | _, _, [ DUuid canvasID ] ->
           uply {
             let! unlocked = UserDB.unlocked canvasID
-            return unlocked |> List.map int64 |> List.map DInt64 |> Dval.list KTInt64
+            return unlocked |> List.map DUInt64 |> Dval.list KTUInt64
           }
         | _ -> incorrectArgs ())
       sqlSpec = NotQueryable

backend/src/BuiltinExecution/Libs/Parser.fs

@@ -3,6 +3,8 @@ module BuiltinExecution.Libs.Parser
 open FSharp.Control.Tasks
 open System.Threading.Tasks
 open System.Text
+open System.Globalization
+open System
 
 open Prelude
 open LibExecution.RuntimeTypes
@@ -29,11 +31,20 @@ let fns : List<BuiltInFn> =
       fn =
         (function
         | _, _, [ DString sourceCode ] ->
-          // This was added to handle EGCs correctly
           let byteIndexToCharIndex (byteIndex : int) (text : string) : int =
             let bytes = Encoding.UTF8.GetBytes(text)
             let subText = Encoding.UTF8.GetString(bytes, 0, byteIndex)
-            subText.Length
+            StringInfo.ParseCombiningCharacters(subText).Length
+
+          let processLine (line : string) (startIndex : int) (endIndex : int) =
+            let textElements = StringInfo.GetTextElementEnumerator(line)
+            let mutable result = ""
+            let mutable currentIndex = 0
+            while textElements.MoveNext() do
+              if currentIndex >= startIndex && currentIndex < endIndex then
+                result <- result + (textElements.GetTextElement())
+              currentIndex <- currentIndex + 1
+            result
 
           let rec mapNodeAtCursor (cursor : TreeCursor) : Dval =
             let mutable children = []
@@ -48,8 +59,9 @@ let fns : List<BuiltInFn> =
 
             let fields =
               let mapPoint (point : Point) =
+                let pointRow = point.row + 1
                 let fields =
-                  [ "row", DInt64 point.row; "column", DInt64 point.column ]
+                  [ "row", DInt64 pointRow; "column", DInt64 point.column ]
                 DRecord(pointTypeName, pointTypeName, [], Map fields)
 
               let startPos = cursor.Current.StartPosition
@@ -59,26 +71,29 @@ let fns : List<BuiltInFn> =
                 let fields = [ "start", mapPoint startPos; "end_", mapPoint endPos ]
                 DRecord(rangeTypeName, rangeTypeName, [], Map fields)
 
-              let startCharIndex = byteIndexToCharIndex startPos.column sourceCode
-              let endCharIndex = byteIndexToCharIndex endPos.column sourceCode
-
               let sourceText =
                 let lines = String.splitOnNewline sourceCode
                 if lines.Length = 0 then
                   ""
                 else
+                  let startLine = lines[startPos.row]
+                  let endLine = lines[endPos.row]
+                  let startCharIndex = byteIndexToCharIndex startPos.column startLine
+                  let endCharIndex = byteIndexToCharIndex endPos.column endLine
+
                   match startPos.row with
                   | row when row = endPos.row ->
-                    lines[row][startCharIndex .. (endCharIndex - 1)]
+                    processLine startLine startCharIndex endCharIndex
                   | _ ->
-                    let firstLine = lines[startPos.row][startCharIndex..]
+                    let firstLine =
+                      processLine startLine startCharIndex startLine.Length
                     let middleLines =
                       if startPos.row + 1 <= endPos.row - 1 then
                         lines[startPos.row + 1 .. endPos.row - 1]
+                        |> List.map (fun line -> processLine line 0 line.Length)
                       else
                         []
-                    let lastLine = lines[endPos.row][.. (endCharIndex - 1)]
-
+                    let lastLine = processLine endLine 0 endCharIndex
                     String.concat "\n" (firstLine :: middleLines @ [ lastLine ])
 
               let fieldName =

backend/src/LibExecution/PackageIDs.fs

@@ -383,6 +383,9 @@ module Fn =
       let parseSingleTestFromFile =
         p [] "parseSingleTestFromFile" "53f3fbc6-25fd-427a-ab0d-ba0559543c99"
 
+      let parseTestFile =
+        p [] "parseTestFile" "95dc8d95-dd38-4df2-aaac-9e78187a17be"
+
   // what we expose to the outside world
   let idForName
     (owner : string)

backend/src/LibExecution/ProgramTypesToRuntimeTypes.fs

@@ -163,9 +163,23 @@ module MatchPattern =
 
 
 module Expr =
+  let replaceEscapeSequences (s: string) : string =
+    s
+    |> fun s -> s.Replace(@"\t", "\t")
+    |> fun s -> s.Replace(@"\n", "\n")
+    |> fun s -> s.Replace(@"\r", "\r")
+    |> fun s -> s.Replace(@"\b", "\b")
+    |> fun s -> s.Replace(@"\f", "\f")
+    |> fun s -> s.Replace(@"\v", "\v")
+    |> fun s -> s.Replace(@"\""", "\"")
+    |> fun s -> s.Replace(@"\'", "'")
+    |> fun s -> s.Replace(@"\\", "\\")
+
   let rec toRT (e : PT.Expr) : RT.Expr =
     match e with
-    | PT.EChar(id, char) -> RT.EChar(id, char)
+    | PT.EChar(id, char) ->
+      let char =  char |> replaceEscapeSequences
+      RT.EChar(id, char)
     | PT.EInt64(id, num) -> RT.EInt64(id, num)
     | PT.EUInt64(id, num) -> RT.EUInt64(id, num)
     | PT.EInt8(id, num) -> RT.EInt8(id, num)
@@ -350,7 +364,20 @@ module Expr =
 
   and stringSegmentToRT (segment : PT.StringSegment) : RT.StringSegment =
     match segment with
-    | PT.StringText text -> RT.StringText text
+    | PT.StringText text ->
+      text
+      |> fun s ->
+        System.Text.RegularExpressions.Regex.Replace(s, @"\\x([0-9A-Fa-f]{2})",
+          fun m ->
+            let hexValue = System.Convert.ToByte(m.Groups[1].Value, 16)
+            string (char hexValue))
+      |> fun s ->
+        System.Text.RegularExpressions.Regex.Replace(s, @"\\u([0-9A-Fa-f]{4})",
+          fun m ->
+            let unicodeValue = System.Convert.ToInt32(m.Groups[1].Value, 16)
+            string (char unicodeValue))
+      |> replaceEscapeSequences
+      |> RT.StringText
     | PT.StringInterpolation expr -> RT.StringInterpolation(toRT expr)
 
 

backend/src/Prelude/Prelude.fs

@@ -290,7 +290,7 @@ let readFloat (f : float) : (Sign * string * string) =
 let makeFloat (sign : Sign) (whole : string) (fraction : string) : float =
   try
     if whole <> "" then assert_ "non-zero string" [] (whole[0] <> '-')
-    if whole <> "0" then assertRe $"makefloat" "[1-9][0-9]*" whole
+    if whole <> "0" then assertRe $"makefloat" "0*[0-9]+" whole
     let sign =
       match sign with
       | Positive -> ""

backend/testfiles/execution/cloud/_events.dark

@@ -4,18 +4,18 @@
 type FruitRecord = { fruits: List<String> }
 
 // getQueue works
-Builtin.testGetQueue_v0 "TestWorker" = []
+Builtin.testGetQueue "TestWorker" = []
 
 // emit works
 (let _ = Builtin.emit "value" "TestWorker"
- let queue = Builtin.testGetQueue_v0 "TestWorker"
+ let queue = Builtin.testGetQueue "TestWorker"
  queue) = [ "\"value\"" ]
 
 // emit works with mixed values
 (let _ = Builtin.emit "value" "TestWorker"
  let _ = Builtin.emit 1 "TestWorker"
  let _ = Builtin.emit (FruitRecord { fruits = [ "apple"; "banana" ] }) "TestWorker"
- let queue = Builtin.testGetQueue_v0 "TestWorker"
- Stdlib.List.sort queue) = [ "\"value\""
-                               "1"
-                               "FruitRecord {\n  fruits: [\n    \"apple\", \"banana\"\n  ]\n}" ]
+ let queue = Builtin.testGetQueue "TestWorker"
+ Stdlib.List.sort queue) = [  "\"value\""
+                              "1"
+                              "FruitRecord {\n  fruits: [\n    \"apple\", \"banana\"\n  ]\n}" ]