Skip to content

Commit b8b25f4

Browse files
authored
Move variable definitions to <local-def> (#78)
* Fix testing program. Used single quotes inside string literals without backlash * Var def goes on the local-def list
1 parent 411d0bb commit b8b25f4

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

dana/programs/linemarket.dana

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ def main
9999

100100

101101
if stores > MAX_STORES or stores < 1:
102-
writeString: "Wrong starting input, let's try again!\n"
102+
writeString: "Wrong starting input, let\'s try again!\n"
103103
stores := readInteger()
104104

105105
if N > MAX_PLACES or N < 1:
106-
writeString: "Wrong starting input, let's try again!\n"
106+
writeString: "Wrong starting input, let\'s try again!\n"
107107
N := readInteger()
108108

109109
i := 0

dana/programs/powint.dana

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
def main
22

33
def powint: base as int, exp as int, mod as int, result as ref int
4+
var temp is int
45

56
base := base % mod
6-
var temp is int
77

88
if exp < 1:
99
result := 1

dana/programs/primeFactors.dana

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
def main
22
# Helper procedure: prints the prime factors of n
33
def primeFactors: n as int
4+
var i is int
5+
46
# Divide out all factors of 2
57
loop:
68
if n % 2 = 0:
79
writeString: " 2"
810
n := n / 2
911
else: break
1012

11-
var i is int
1213
i := 3
1314
# Loop over odd numbers starting from 3 while i*i <= n
1415
loop:

0 commit comments

Comments
 (0)