Merge pull request #1137 from nevkontakte/es6-loads

nevkontakte · web-flow · commit 2d12e515e87e · 2022-08-16T22:31:31.000+01:00
Use ES 2015 syntax to generate more compact code for blocking functions.
diff --git a/compiler/package.go b/compiler/package.go
@@ -805,7 +805,7 @@ func translateFunction(typ *ast.FuncType, recv *ast.Ident, body *ast.BlockStmt,
 
 	if len(c.Flattened) != 0 {
 		c.localVars = append(c.localVars, "$s")
-		prefix = prefix + " $s = 0;"
+		prefix = prefix + " $s = $s || 0;"
 	}
 
 	if c.HasDefer {
@@ -816,19 +816,29 @@ func translateFunction(typ *ast.FuncType, recv *ast.Ident, body *ast.BlockStmt,
 		}
 	}
 
+	localVarDefs := "" // Function-local var declaration at the top.
+
 	if len(c.Blocking) != 0 {
-		c.localVars = append(c.localVars, "$r")
 		if funcRef == "" {
 			funcRef = "$b"
 			functionName = " $b"
 		}
-		var stores, loads string
-		for _, v := range c.localVars {
-			loads += fmt.Sprintf("%s = $f.%s; ", v, v)
-			stores += fmt.Sprintf("$f.%s = %s; ", v, v)
-		}
-		prefix = prefix + " var $f, $c = false; if (this !== undefined && this.$blk !== undefined) { $f = this; $c = true; " + loads + "}"
-		suffix = " if ($f === undefined) { $f = { $blk: " + funcRef + " }; } " + stores + "return $f;" + suffix
+
+		localVars := append([]string{}, c.localVars...)
+		// There are several special variables involved in handling blocking functions:
+		// $r is sometimes used as a temporary variable to store blocking call result.
+		// $c indicates that a function is being resumed after a blocking call when set to true.
+		// $f is an object used to save and restore function context for blocking calls.
+		localVars = append(localVars, "$r")
+		// If a blocking function is being resumed, initialize local variables from the saved context.
+		localVarDefs = fmt.Sprintf("var {%s, $c} = $restore(this, {%s});\n", strings.Join(localVars, ", "), strings.Join(params, ", "))
+		// If the function gets blocked, save local variables for future.
+		saveContext := fmt.Sprintf("var $f = {$blk: "+funcRef+", $c: true, $r, %s};", strings.Join(c.localVars, ", "))
+
+		suffix = " " + saveContext + "return $f;" + suffix
+	} else if len(c.localVars) > 0 {
+		// Non-blocking functions simply declare local variables with no need for restore support.
+		localVarDefs = fmt.Sprintf("var %s;\n", strings.Join(c.localVars, ", "))
 	}
 
 	if c.HasDefer {
@@ -865,8 +875,8 @@ func translateFunction(typ *ast.FuncType, recv *ast.Ident, body *ast.BlockStmt,
 	if suffix != "" {
 		bodyOutput = bodyOutput + strings.Repeat("\t", c.pkgCtx.indentation+1) + "/* */" + suffix + "\n"
 	}
-	if len(c.localVars) != 0 {
-		bodyOutput = fmt.Sprintf("%svar %s;\n", strings.Repeat("\t", c.pkgCtx.indentation+1), strings.Join(c.localVars, ", ")) + bodyOutput
+	if localVarDefs != "" {
+		bodyOutput = strings.Repeat("\t", c.pkgCtx.indentation+1) + localVarDefs + bodyOutput
 	}
 
 	c.pkgCtx.escapingVars = prevEV
diff --git a/compiler/prelude/goroutines.go b/compiler/prelude/goroutines.go
@@ -223,6 +223,13 @@ var $block = function() {
   $curGoroutine.asleep = true;
 };
 
+var $restore = function(context, params) {
+  if (context !== undefined && context.$blk !== undefined) {
+    return context;
+  }
+  return params;
+}
+
 var $send = function(chan, value) {
   if (chan.$closed) {
     $throwRuntimeError("send on closed channel");
diff --git a/compiler/prelude/prelude_min.go b/compiler/prelude/prelude_min.go
