Made ; work as statements separator.

Author: pigpigyyy

doc/docs/doc/README.md

@@ -1588,6 +1588,19 @@ print ok, count, first
 
 YueScript is a whitespace significant language. You have to write some code block in the same indent with space **' '** or tab **'\t'** like function body, value list and some control blocks. And expressions containing different whitespaces might mean different things. Tab is treated like 4 space, but it's better not mix the use of spaces and tabs.
 
+### Statement Separator
+
+A statement normally ends at a line break. You can also use a semicolon `;` to explicitly terminate a statement, which allows writing multiple statements on the same line:
+
+```moonscript
+a = 1; b = 2; print a + b
+```
+<YueDisplay>
+<pre>
+a = 1; b = 2; print a + b
+</pre>
+</YueDisplay>
+
 ### Multiline Chaining
 
 You can write multi-line chaining function calls with a same indent.

doc/docs/zh/doc/README.md

@@ -1586,6 +1586,19 @@ print ok, count, first
 
 月之脚本是一个对空白敏感的语言。你必须在相同的缩进中使用空格 **' '** 或制表符 **'\t'** 来编写一些代码块，如函数体、值列表和一些控制块。包含不同空白的表达式可能意味着不同的事情。制表符被视为4个空格，但最好不要混合使用空格和制表符。
 
+### 语句分隔符
+
+一条语句通常以换行结束。你也可以使用分号 `;` 显式结束一条语句，从而在同一行中编写多条语句：
+
+```moonscript
+a = 1; b = 2; print a + b
+```
+<YueDisplay>
+<pre>
+a = 1; b = 2; print a + b
+</pre>
+</YueDisplay>
+
 ### 多行链式调用
 
 你可以使用相同的缩进来编写多行链式函数调用。

spec/inputs/syntax.yue

@@ -7,7 +7,7 @@ a, bunch, go, here = another, world, nil, nil
 func arg1, arg2, another, arg3
 
 here, we = () ->, yeah
-the, different = () -> approach; yeah
+the, different = (() -> approach), yeah
 
 dad()
 dad(lord)
@@ -321,7 +321,7 @@ ajax url,
 	(error) ->
 		print error
 
--- 
+--
 a += 3 - 5
 a *= 3 + 5
 a *= 3
@@ -480,11 +480,54 @@ do
 
 do
 	return res if res ~= ""
-		
+
 
 do
 	return res if res ~= ""
 		--
 
+do
+	a = 1; b = 2; c = a + b
+	print a; print b; print c
+
+	f = ->
+		a = 1; b = 2; a + b
+
+	a = 1;
+	b = 2;
+
+	success, result = try func!; print result if success
+
+	value = "foo"; print value; value = value .. "bar"; print value
+
+	do
+		if ok then print "ok!"; return 42
+
+	for i=1,3
+		print i; continue
+
+	n = 0
+	while n < 2
+		print "n=", n; n += 1
+
+	obj = {}
+	obj\set 10; obj\get!; print "done"
+
+	with tbl
+		\push 1; print "push"
+
+	a = 5
+	if a > 3
+		print "big"; b = a * 2; print b
+	else
+		print "small"; b = a
+
+	try
+		x = 1; y = 2; print x + y
+	catch err
+		print "error:", err
+
+	q = 1;; w = 2;;; e = 3; print q, w, e;
+
 nil
 

spec/inputs/unicode/syntax.yue

@@ -7,7 +7,7 @@
 函数 参数1, 参数2, 另外, 参数3
 
 这里, 我们 = () ->, 是的
-这个, 不同 = () -> 方法; 是的
+这个, 不同 = (() -> 方法), 是的
 
 爸爸()
 爸爸(主)

spec/inputs/unicode/whitespace.yue

@@ -97,19 +97,19 @@ v = ->
 			变量c -- v3
 
 v1, v2, \
-	v3 = ->
-	变量a; \-- 函数结束于v1
+	v3 = (->
+	变量a), \-- 函数结束于v1
 		变量b, \-- v2
 			变量c -- v3
 
 变量a, 变量b, \
 	变量c, 变量d, \
 变量e, 变量f = 1, \
-	f2
-		:abc; \-- 参数2
+	(f2
+		:abc), \-- 参数2
 		3, \
 			4, \
-				函数5 abc; \-- 参数5
+				函数5(abc), \-- 参数5
 					6
 
 for 变量a, \-- 解构1

spec/inputs/whitespace.yue

@@ -128,19 +128,19 @@ v = ->
 			c -- v3
 
 v1, v2, \
-	v3 = ->
-	a; \-- end of function for v1
+	v3 = (->
+	a), \-- end of function for v1
 		b, \-- v2
 			c -- v3
 
 a, b, \
 	c, d, \
 e, f = 1, \
-	f2
-		:abc; \-- arg2
+	(f2
+		:abc), \-- arg2
 		3, \
 			4, \
-				f5 abc; \-- arg5
+				f5(abc), \-- arg5
 					6
 
 for a, \-- destruct 1

spec/outputs/codes_from_doc.lua

@@ -756,6 +756,9 @@ end
 	local first = select(1, ...)
 	return print(ok, count, first)
 end)(fn(true))
+local a = 1
+local b = 2
+print(a + b)
 Rx.Observable.fromRange(1, 8):filter(function(x)
 	return x % 2 == 0
 end):concat(Rx.Observable.of('who do we appreciate')):map(function(value)
@@ -3283,6 +3286,9 @@ end
 	local first = select(1, ...)
 	return print(ok, count, first)
 end)(fn(true))
+local a = 1
+local b = 2
+print(a + b)
 Rx.Observable.fromRange(1, 8):filter(function(x)
 	return x % 2 == 0
 end):concat(Rx.Observable.of('who do we appreciate')):map(function(value)

spec/outputs/codes_from_doc_zh.lua

@@ -756,6 +756,9 @@ end
 	local first = select(1, ...)
 	return print(ok, count, first)
 end)(fn(true))
+local a = 1
+local b = 2
+print(a + b)
 Rx.Observable.fromRange(1, 8):filter(function(x)
 	return x % 2 == 0
 end):concat(Rx.Observable.of('who do we appreciate')):map(function(value)
@@ -3277,6 +3280,9 @@ end
 	local first = select(1, ...)
 	return print(ok, count, first)
 end)(fn(true))
+local a = 1
+local b = 2
+print(a + b)
 Rx.Observable.fromRange(1, 8):filter(function(x)
 	return x % 2 == 0
 end):concat(Rx.Observable.of('who do we appreciate')):map(function(value)

spec/outputs/syntax.lua

@@ -5,9 +5,9 @@ func(arg1, arg2, another, arg3)
 local we
 here, we = function() end, yeah
 local the, different
-the, different = function()
+the, different = (function()
 	return approach
-end, yeah
+end), yeah
 dad()
 dad(lord)
 hello(one, two)();
@@ -441,4 +441,74 @@ do
 		end
 	end)())
 end
+do
+	a = 1
+	local b = 2
+	local c = a + b
+	print(a)
+	print(b)
+	print(c)
+	f = function()
+		a = 1
+		b = 2
+		return a + b
+	end
+	a = 1
+	b = 2
+	local success, result = pcall(function()
+		return func()
+	end)
+	if success then
+		print(result)
+	end
+	local value = "foo"
+	print(value)
+	value = value .. "bar"
+	print(value)
+	do
+		if ok then
+			print("ok!")
+		end
+		return 42
+	end
+	for i = 1, 3 do
+		print(i)
+		goto _continue_0
+		::_continue_0::
+	end
+	local n = 0
+	while n < 2 do
+		print("n=", n)
+		n = n + 1
+	end
+	local obj = { }
+	obj:set(10)
+	obj:get()
+	print("done")
+	do
+		local _with_0 = tbl
+		_with_0:push(1)
+		print("push")
+	end
+	a = 5
+	if a > 3 then
+		print("big")
+		b = a * 2
+		print(b)
+	else
+		print("small")
+		b = a
+	end
+	xpcall(function()
+		x = 1
+		y = 2
+		return print(x + y)
+	end, function(err)
+		return print("error:", err)
+	end)
+	local q = 1
+	local w = 2
+	local e = 3
+	print(q, w, e)
+end
 return nil

spec/outputs/unicode/syntax.lua

@@ -5,9 +5,9 @@ _u51fd_u6570(_u53c2_u65701, _u53c2_u65702, _u53e6_u5916, _u53c2_u65703)
 local _u6211_u4eec
 _u8fd9_u91cc, _u6211_u4eec = function() end, _u662f_u7684
 local _u8fd9_u4e2a, _u4e0d_u540c
-_u8fd9_u4e2a, _u4e0d_u540c = function()
+_u8fd9_u4e2a, _u4e0d_u540c = (function()
 	return _u65b9_u6cd5
-end, _u662f_u7684
+end), _u662f_u7684
 _u7238_u7238()
 _u7238_u7238(_u4e3b)
 _u4f60_u597d(_u4e00, _u4e8c)();