#33 - Новый способ вывода +semver:feature (#125)

* #33 - лексика

* #33 - грамматика

* #33 - статический анализ

* #33 - кодогенерация

* #33 - удаление метода 'print'

* #33 - правка скриптов в тестах

* #33 - документация

Author: Stepami

Readme.md

@@ -168,8 +168,12 @@ let l = array[2]
 ```
 let s = v2d as string
 ```
-#### Стандартная библиотека
-- Функция `print` c сигнатурой `(string) => void`; осуществляет печать строки на экран
+#### Печать на экран
+```
+let obj = {}
+>>>obj
+>>>"Hello, World!"
+```
 
 ### Требования
 

samples/abs.js

@@ -5,5 +5,4 @@ function abs(x: number): number {
 }
 
 let x = -10
-let a = abs(x)
-print(a as string)
+>>> abs(x)

samples/arraddremove.js

@@ -1,3 +1,3 @@
 let arr = [3,3,2,1,] ++ [4,5,]
 arr::0
-print(arr as string)
+>>>arr

samples/arreditread.js

@@ -2,4 +2,4 @@ let arr = [1,2,1,]
 let item = arr[0]
 item = item + 2
 arr[0] = item
-print(arr as string)
+>>>arr

samples/ceil.js

@@ -2,5 +2,4 @@ function ceil(x: number): number {
     return x + (1 - x % 1)
 }
 
-let c = ceil(3.3)
-print(c as string)
+>>> ceil(3.3)

samples/cycled.js

@@ -5,4 +5,4 @@ let obj: CycledType = {
     x: null;
 }
 obj.x = obj
-print(obj as string)
+>>>obj

samples/defaultarray.js

@@ -2,4 +2,4 @@ type numbers = number[]
 
 let a: numbers
 
-print(a as string)
+>>>a

samples/equals.js

@@ -14,5 +14,4 @@ let obj2: withEquals = {
     prop: 2;
 }
 
-let res = obj1.equals(obj2)
-print(res as string)
+>>> obj1.equals(obj2)

samples/exprtest.js

@@ -1,3 +1,3 @@
 let a = 1 + 3 * 2 - 5 / 5
 // a == 6
-print(a as string)
+>>>a

samples/fastpow.js

@@ -17,6 +17,4 @@ function fastPow(base: number, power: number): number {
     return multiplier * multiplier * base
 }
 
-let p = fastPow(13, 3)
-
-print(p as string)
+>>> fastPow(13, 3)

samples/forwardref.js

@@ -12,4 +12,4 @@ let a: A = {
     };
 }
 
-print(a as string)
+>>>a

samples/gcd.js

@@ -9,6 +9,4 @@ function gcd(a: number, b: number): number {
     return gcd(bb, aa % bb)
 }
 
-let g = gcd(1280, 720)
-
-print(g as string)
+>>> gcd(1280, 720)

samples/lcm.js

@@ -15,5 +15,4 @@ function lcm(a: number, b: number): number {
     return (abs(a * b)) / (gcd(a, b))
 }
 
-let l = lcm(1280, 720)
-print(l as string)
+>>> lcm(1280, 720)

samples/linkedlist.js

@@ -42,7 +42,6 @@ linkedList.append(3)
 linkedList.append(5)
 linkedList.append(7)
 
-print(linkedList as string)
+>>>linkedList
 
-let odds = linkedList.getOdd()
-print(odds as string)
+>>> linkedList.getOdd()

samples/objeditread.js

@@ -11,4 +11,4 @@ let obj2 = {
 }
 
 obj2.k = obj1.p.s.v
-print(obj2 as string)
+>>>obj2

samples/posneg.js

@@ -8,9 +8,9 @@ function negative(x: number): boolean {
 
 let x = 0
 if (positive(x)) {
-    print("positive")
+    >>>"positive"
 } else if (negative(x)) {
-    print("negative")
+    >>>"negative"
 } else {
-    print("zero")
+    >>>"zero"
 }

samples/prime.js

@@ -14,6 +14,4 @@ function prime(x: number): boolean {
     return true
 }
 
-let b = prime(13)
-
-print(b as string)
+>>> prime(13)

samples/primefactor.js

@@ -5,12 +5,12 @@ let factor = 2
 while (factor * factor <= n) {
     while (n % factor == 0) {
         n = n / factor
-        print(factor as string)
+        >>>factor
     }
 
     factor = factor + 1
 }
 
 if (n != 1) {
-    print(factor as string)
+    >>>factor
 }

samples/quicksort.js

@@ -41,4 +41,4 @@ function quickSort(values: ints) {
 
 let numbers = [6,2,4,3,7,1,5,]
 quickSort(numbers)
-print(numbers as string)
+>>>numbers

samples/range.js

@@ -12,5 +12,4 @@ function range(n: int): ints {
     return r
 }
 
-let r1to6 = range(6)
-print(r1to6 as string)
+>>> range(6)

samples/recur.js

@@ -20,9 +20,9 @@ let n: number
 n = 6
 let fa6 = fact(6)
 let fa6s = fa6 as string
-print("fact(6) = " + fa6s)
+>>> "fact(6) = " + fa6s
 
 n = 9
 let fi9 = fib(9)
 let fi9s = fi9 as string
-print("fib(9) = " + fi9s)
+>>> "fib(9) = " + fi9s

samples/scope.js

@@ -7,4 +7,4 @@ x = {
     x: 1;
 }
 
-print(x.x as string)
+>>>x.x

samples/searchinll.js

@@ -26,7 +26,7 @@ function searchEven(n: node): number {
     let h = n
     while (h != null) {
         let d = h.data
-        print(d as string)
+        >>>d
         if (d % 2 == 0) {
             return d
         }
@@ -36,5 +36,5 @@ function searchEven(n: node): number {
 }
 
 let j = searchEven(head)
-print("found Even:")
-print(j as string)
+>>>"found Even:"
+>>>j

samples/settable.js

@@ -5,7 +5,7 @@ type settable = {
 function setprop(obj: settable, str: string) {
     obj.prop = str
     if (obj.prop == "1") {
-        print("prop is one")
+        >>>"prop is one"
     }
 }
 
@@ -15,4 +15,4 @@ let obj: settable = {
 
 obj.setprop("1")
 obj.setprop("2")
-print(obj as string)
+>>>obj

samples/squareroot.js

@@ -18,6 +18,4 @@ function sqrt(num: number): number {
     return guess
 }
 
-let sr = sqrt(3)
-
-print(sr as string)
+>>> sqrt(3)

samples/summator.js

@@ -12,5 +12,4 @@ let summator: summable = {
     y: 2;
 }
 
-let s = summator.sum()
-print(s as string)
+>>> summator.sum()

samples/tern.js

@@ -1,2 +1,2 @@
 let x = 1 > 0 ? 0 <= 1 ? 1 : 0 : -2 < 0 ? -1 : 0
-print(x as string)
+>>>x

samples/this.js

@@ -5,7 +5,7 @@ type ObjType = {
 }
 
 function toString(obj: ObjType): string {
-    let s = "object obj:\n"
+    let s = "object obj: "
     return s + (obj as string)
 }
 
@@ -15,4 +15,4 @@ let obj: ObjType = {
     str: "field";
 }
 
-print(obj.toString())
+>>> obj.toString()

samples/vec2d.js

@@ -18,6 +18,6 @@ function vlensquared(v: vec2d): number {
 
 let v = makeVec(3, 4)
 let l = vlensquared(v)
-print(l as string)
+>>>l
 l = v.vlensquared()
-print(l as string)
+>>>l

src/Application/HydraScript.Application.CodeGeneration/Visitors/ExpressionInstructionProvider.cs

@@ -260,60 +260,47 @@ public AddressedInstructions Visit(CallExpression visitable)
     {
         if (visitable.IsEmptyCall)
             return [];
+
         var methodCall = !visitable.Empty();
-        if (visitable.Id.Name is "print" && !methodCall)
+        string functionId;
+        AddressedInstructions result = [];
+
+        if (methodCall)
         {
-            var param = visitable.Parameters[0];
-            
-            if (param is PrimaryExpression prim)
-                return [new Print(_valueDtoConverter.Convert(prim.ToValueDto()))];
-            
-            var result = param.Accept(This);
-            var last = new Name(result.OfType<Simple>().Last().Left!);
-            result.Add(new Print(last));
-            
-            return result;
+            var memberInstructions = visitable.Member.Accept(This);
+            var lastMemberInstruction = (DotRead)memberInstructions[memberInstructions.End];
+            memberInstructions.Remove(lastMemberInstruction);
+            result.AddRange(memberInstructions);
+
+            functionId = lastMemberInstruction.Property;
         }
         else
         {
-            string functionId;
-            AddressedInstructions result = [];
-            if (methodCall)
-            {
-                var memberInstructions = visitable.Member.Accept(This);
-                var lastMemberInstruction = (DotRead)memberInstructions[memberInstructions.End];
-                memberInstructions.Remove(lastMemberInstruction);
-                result.AddRange(memberInstructions);
+            functionId = visitable.Id;
+        }
 
-                functionId = lastMemberInstruction.Property;
-            }
+        if (methodCall)
+        {
+            var caller = result.Any() ? result.OfType<Simple>().Last().Left! : visitable.Id;
+            result.Add(new PushParameter(new Name(caller)));
+        }
+
+        foreach (var expr in visitable.Parameters)
+        {
+            if (expr is PrimaryExpression primary)
+                result.Add(new PushParameter(_valueDtoConverter.Convert(primary.ToValueDto())));
             else
             {
-                functionId = visitable.Id;
+                result.AddRange(expr.Accept(This));
+                var id = result.OfType<Simple>().Last().Left!;
+                result.Add(new PushParameter(new Name(id)));
             }
-            var functionInfo = new FunctionInfo(functionId);
+        }
 
-            if (methodCall)
-            {
-                var caller = result.Any() ? result.OfType<Simple>().Last().Left! : visitable.Id;
-                result.Add(new PushParameter(new Name(caller)));
-            }
-            foreach (var expr in visitable.Parameters)
-            {
-                if (expr is PrimaryExpression primary)
-                    result.Add(new PushParameter(_valueDtoConverter.Convert(primary.ToValueDto())));
-                else
-                {
-                    result.AddRange(expr.Accept(This));
-                    var id = result.OfType<Simple>().Last().Left!;
-                    result.Add(new PushParameter(new Name(id)));
-                }
-            }
+        result.Add(new CallFunction(
+            new FunctionInfo(functionId),
+            visitable.HasReturnValue));
 
-            result.Add(new CallFunction(
-                functionInfo,
-                visitable.HasReturnValue));
-            return result;
-        }
+        return result;
     }
 }