Pridan skript na spousteni testu, pridany testy pro scanner, opraven bug se zacyklenym vracenim eol u scanneru

Author: Jiri Jurica

Makefile

@@ -37,3 +37,6 @@ tokstack.o: tokstack.c
 
 clean:
 	rm -f *.o *.out *.gch
+
+test:
+	tests/runtest.sh

cmake-build-debug/CMakeFiles/clion-log.txt

@@ -0,0 +1 @@
+CMakeLists.txt not found in /home/jirkaj/Git/ifj-compilator

scanner.c

@@ -259,7 +259,7 @@ int getToken(token_t *loadedToken)
     static bool useLastChar = false;
 
     // Step for calling this function after EOF token was send.
-    if (lastChar == EOF) return setTokenType(loadedToken, TOK_endOfLine);
+    if (lastChar == EOF) return setTokenType(loadedToken, TOK_endOfFile);
     if (useLastChar)
     {
         currChar = lastChar;

tests/expr/returnvalues

@@ -1,30 +1,30 @@
-test1   0
-test2   0
-test3   3
-test4   0
-test5   0
-test6   0
-test7   0
-test8   0
-test9   2
-test10  0
-test11  0
-test12  4
-test13  0
-test14  0
-test15  0
-test16  0
-test17  0
-test18  0
-test19  0
-test20  4
-test21  0
-test22  0
-test23  2
-test24  0
-test25  0
-test26  2
-test27  0
-test28  0
-test29  4
-test30  4
+test1 0
+test2 0
+test3 3
+test4 0
+test5 0
+test6 0
+test7 0
+test8 0
+test9 2
+test10 0
+test11 0
+test12 4
+test13 0
+test14 0
+test15 0
+test16 0
+test17 0
+test18 0
+test19 0
+test20 4
+test21 0
+test22 0
+test23 2
+test24 0
+test25 0
+test26 2
+test27 0
+test28 0
+test29 4
+test30 4

tests/expr/test1.ref

@@ -1 +1 @@
- 15
+ 15

tests/runtest.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+red='\033[1;31m'
+green='\033[1;32m'
+nc='\033[0m'
+
+compiler="./compiler"
+interpreter="tests/ic17int"
+instructionFile=$(mktemp)
+outputFile=$(mktemp)
+
+echo "ICAgICAgICAgICAgICAgICBfX189PT09LV8gIF8tPT09PV9fXwogICAgICAgICAgIF8tLV5eXiMjIyMjLy8gICAgICBcXCMjIyMjXl5eLS1fCiAgICAgICAgXy1eIyMjIyMjIyMjIy8vICggICAgKSBcXCMjIyMjIyMjIyNeLV8KICAgICAgIC0jIyMjIyMjIyMjIyMvLyAgfFxeXi98ICBcXCMjIyMjIyMjIyMjIy0KICAgICBfLyMjIyMjIyMjIyMjIy8vICAgKEA6OkApICAgXFwjIyMjIyMjIyMjIyNcXwogICAgLyMjIyMjIyMjIyMjIyMoKCAgICAgXFwvLyAgICAgKSkjIyMjIyMjIyMjIyMjXAogICAtIyMjIyMjIyMjIyMjIyMjXFwgICAgKG9vKSAgICAvLyMjIyMjIyMjIyMjIyMjIy0KICAtIyMjIyMjIyMjIyMjIyMjIyNcXCAgLyBWViBcICAvLyMjIyMjIyMjIyMjIyMjIyMjLQogLSMjIyMjIyMjIyMjIyMjIyMjIyNcXC8gICAgICBcLy8jIyMjIyMjIyMjIyMjIyMjIyMjLQpfIy98IyMjIyMjIyMjIy9cIyMjIyMjKCAgIC9cICAgKSMjIyMjIy9cIyMjIyMjIyMjI3xcI18KfC8gfCMvXCMvXCMvXC8gIFwjL1wjI1wgIHwgIHwgIC8jIy9cIy8gIFwvXCMvXCMvXCN8IFx8CmAgIHwvICBWICBWICBgICAgViAgXCNcfCB8ICB8IHwvIy8gIFYgICAnICBWICBWICBcfCAgJwogICBgICAgYCAgYCAgICAgIGAgICAvIHwgfCAgfCB8IFwgICAnICAgICAgJyAgJyAgICcKICAgICAgICAgICAgICAgICAgICAoICB8IHwgIHwgfCAgKQogICAgICAgICAgICAgICAgICAgX19cIHwgfCAgfCB8IC9fXwogICAgICAgICAgICAgICAgICAodnZ2KFZWVikoVlZWKXZ2dikKCg==" | base64 -d
+
+printf "IFJ TESTING\n\n"
+
+for testDir in `find tests/ -maxdepth 1 -type d | sort | tail -n +2`; do
+	if [ ! -f "$testDir/returnvalues" ]; then	# Pokud neni v testech return value, slozka se preskoci
+		continue
+	fi
+	
+	printf "[ == %s == ]\n" `echo "$testDir" | cut -d/ -f2` # Nazev kolekce testu
+
+	for t in `find "$testDir" -type f -regex ".*test[0-9]*" | sort -V`; do
+		testName=`echo $t | cut -d/ -f3`
+		expectedReturnCode=`grep "^$testName " $testDir/returnvalues | cut -d' ' -f2`
+		$compiler < "$t" > "$instructionFile" 2>/dev/null
+		returnCode=$?
+		
+		if [ $expectedReturnCode -eq $returnCode ]; then
+			if [ $expectedReturnCode -eq 0 -a ! -f "${t}.ref" ]; then
+				continue	# Ocekava se, ze pokud se kod v poradku zkompiluje, bude ve slozce soubor na porovnani vysledku interpreteru
+			elif [ $expectedReturnCode -eq 0 ]; then
+				$interpreter "$instructionFile" > "$outputFile" 2>/dev/null
+				diff "$outputFile" "${t}.ref" > /dev/null 2>&1
+				if [ $? -eq 0 ]; then	# Porovnani vystupu interpreteru
+					result="${green}OK${nc}"
+				else
+					result="${red}FAIL${nc}"
+				fi
+			else	# Shoduji se navratove kody compilatoru a nejsou 0
+				result="${green}OK${nc}"
+			fi
+		else	# Neshoduji se navratove kody compilatoru
+			result="${red}FAIL${nc}"
+		fi
+
+		printf "$testName $result\n"
+		
+		
+	done
+	echo
+done
+
+rm $instructionFile
+rm $outputFile

tests/valid-codes/.strings.bsa.swp tests/scanner/.returnvalues.swp

@@ -0,0 +1,29 @@
+test1 0
+test2 0
+test3 0
+test4 0
+test5 2
+test6 1
+test7 0
+test8 2
+test9 0
+test10 0
+test11 0
+test12 0
+test13 0
+test14 0
+test15 1
+test16 1
+test17 3
+test18 3
+test19 0
+test20 0
+test21 0
+test22 0
+test23 0
+test24 0
+test25 0
+test26 0
+test27 2
+test28 2
+test29 2

tests/scanner/code.bsa

@@ -0,0 +1,4 @@
+'pripustna varianta identifikatoru
+scope
+	dim aHoj as integer
+end scope

tests/scanner/code2.bsa

@@ -0,0 +1,4 @@
+'mozny double
+scope
+	dim ahoj as double = 1.654
+end scope

tests/scanner/code4.bsa

@@ -0,0 +1,4 @@
+'mozny double
+scope
+	dim ahoj as double = 1e2
+end scope

tests/scanner/inst

@@ -0,0 +1,4 @@
+'mozny double
+scope
+	dim ahoj as double = 1e+2
+end scope

tests/scanner/returnvalues

@@ -0,0 +1,4 @@
+'mozny double
+scope
+	dim ahoj as double = 2.4E6
+end scope

tests/scanner/test1

@@ -0,0 +1,4 @@
+'mozny double
+scope
+	dim ahoj as double = 2.4E-9
+end scope

tests/scanner/test1.ref

@@ -0,0 +1,4 @@
+'nepodporovany zapis desetinneho cisla
+scope
+	dim ahoj as double = 0.
+end scope

tests/scanner/test10

@@ -0,0 +1,4 @@
+'nepodporovany zapis desetinneho cisla
+scope
+	dim ahoj as double = .0
+end scope

tests/scanner/test10.ref

@@ -0,0 +1,4 @@
+'chybny zapis double
+scope
+	dim ahoj as double = 1+e2
+end scope

tests/scanner/test11

@@ -0,0 +1,4 @@
+'chybny zapis double
+scope
+	dim ahoj as double = 1C2
+end scope

tests/scanner/test11.ref

@@ -0,0 +1,4 @@
+'vypis stringu
+scope
+	print !"";
+end scope

tests/scanner/test12

@@ -0,0 +1,4 @@
+'pripustna varianta identifikatoru
+scope
+	dim _1234 as integer
+end scope

tests/scanner/test12.ref

@@ -0,0 +1,4 @@
+'vypis stringu
+scope
+	print !"abc";
+end scope

tests/scanner/test13

@@ -0,0 +1 @@
+abc

tests/scanner/test13.ref

@@ -0,0 +1,4 @@
+'vypis i s jednoduchou escape sekvenci
+scope
+	print !"\"";
+end scope

tests/scanner/test14

@@ -0,0 +1 @@
+"

tests/scanner/test14.ref

@@ -0,0 +1,4 @@
+'vypis i s nekolika escape sekvencemi
+scope
+	print !"\n\\ \"";
+end scope

tests/scanner/test15

@@ -0,0 +1,2 @@
+
+\ "

tests/scanner/test16

@@ -0,0 +1,4 @@
+'vypis s nekolika escape sekvencemi
+scope
+	print !"\n\t\065";
+end scope

tests/scanner/test17

@@ -0,0 +1,2 @@
+
+	A

tests/scanner/test18

@@ -0,0 +1,4 @@
+'vypis s nekolika escape sekvencemi
+scope
+	print !"Ahoj\nSve'te\\ \034";
+end scope

tests/scanner/test19

@@ -0,0 +1,2 @@
+Ahoj
+Sve'te\ "

tests/scanner/test19.ref

@@ -0,0 +1,4 @@
+'vypis s nekolika escape sekvencemi
+scope
+	print !"\065\104\111\106\044\032\080\101\116\101\114\101\033\010";
+end scope

tests/scanner/test2

@@ -0,0 +1 @@
+Ahoj, Petere!

tests/scanner/test2.ref

@@ -0,0 +1,5 @@
+'vypis s primim eol, ktere by melo fungovat
+scope
+	print !"A
+hoj";
+end scope

tests/scanner/test20

@@ -0,0 +1,2 @@
+A
+hoj

tests/scanner/test20.ref

@@ -0,0 +1,4 @@
+'vypis s chybou
+scope
+	print !"\";
+end scope

tests/scanner/test21

@@ -0,0 +1,4 @@
+'vypis s chybou
+scope
+	print !"ah;
+end scope

tests/scanner/test21.ref

@@ -0,0 +1,4 @@
+'vypis s chybou
+scope
+	print "hoj";
+end scope

tests/scanner/test22

@@ -0,0 +1,4 @@
+'pripustna varianta identifikatoru
+scope
+	dim _lipo as integer
+end scope

tests/scanner/test22.ref

@@ -0,0 +1,4 @@
+'pripustna varianta identifikatoru
+scope
+	dim _ as integer
+end scope

tests/scanner/test23

@@ -0,0 +1,4 @@
+'nepripustna varianta identifikatoru
+scope
+	dim 21yolo as integer
+end scope

tests/scanner/test23.ref

@@ -0,0 +1,4 @@
+'nepripustna varianta identifikatoru
+scope
+	dim #!@@%#! as integer
+end scope

tests/scanner/test24

@@ -0,0 +1,4 @@
+'vhodny integer
+scope
+	dim ahoj as integer = 1234
+end scope

tests/scanner/test24.ref

@@ -0,0 +1,4 @@
+'dle zadani nepripustna zaporna celociselna hodnota
+scope
+	dim ahoj as integer = -650
+end scope

tests/scanner/test25

@@ -0,0 +1,4 @@
+'mozny double
+scope
+	dim ahoj as double = 0.0
+end scope