Data update

Task/Goldbachs-comet/EasyLang/goldbachs-comet.easy

@@ -1,40 +1,30 @@
-proc isprime n . r .
-   r = 1
-   if n <= 1
-      r = 0
-      break 1
+func isprim n .
+   if n mod 2 = 0 and n > 2
+      return 0
    .
-   if n mod 2 = 0
-      if n = 2
-         break 1
-      .
-      r = 0
-      break 1
-   .
-   for i = 3 step 2 to sqrt n
+   i = 3
+   sq = sqrt n
+   while i <= sq
       if n mod i = 0
-         r = 0
-         break 2
+         return 0
       .
+      i += 2
    .
+   return 1
 .
-proc goldbach n . cnt .
-   cnt = 0
-   for i = 1 to n div 2
-      call isprime i r
-      if r = 1
-         call isprime n - i r
-         cnt += r
+func goldbach n .
+   for i = 2 to n div 2
+      if isprim i = 1
+         cnt += isprim (n - i)
       .
    .
+   return cnt
 .
 numfmt 0 3
 for n = 4 step 2 to 202
-   call goldbach n r
-   write r
+   write goldbach n
    if n mod 20 = 2
       print ""
    .
 .
-call goldbach 1000000 r
-print r
+print goldbach 1000000