Aktualizovat du3/program.c

This commit is contained in:
Tomáš Vlček 2026-03-19 00:50:56 +00:00
parent e9d0b303bb
commit ab6cda9811

View File

@ -30,7 +30,6 @@ float IsArithCorrect(float num1, float num2, char* op, float result)
if ((num1/num2) == result ) { return 1;} if ((num1/num2) == result ) { return 1;}
break; break;
} }
printf("%.3f", num2);
return 0; return 0;
} }
@ -56,24 +55,54 @@ int main()
num2Temp[0] = '\0'; num2Temp[0] = '\0';
resultTemp[0] = '\0'; resultTemp[0] = '\0';
int writeIntoArrayNum = 1; int writeIntoArrayNum = 1;
bool hasOper = false; bool foundOp = false;
bool hasEqualsSign = false; bool foundEqualSign = false;
char op1 = 'N'; //N = 'None/NIC' char op1 = 'N'; //N = 'None/NIC'
for (int i = 0; strBuffer[i] != '\0'; i++) for (int i = 0; strBuffer[i] != '\0'; i++)
{ {
if (isdigit(strBuffer[i]) != 0) if (isspace() != 0)
{ {
//skontroluj, ze ci char po nom je tiez cislo (a NIE je desat. bodka), AK NIE, povazuj buduce cisla v riadku ako ine cislo continue;
// a inkrementuj kontrolnu citaciu premenu }
if (isdigit(strBuffer[i+1]) == 0 && strBuffer[i+1] != '.') if (isdigit(strBuffer[i]) != 0 || strBuffer[i] == '.')
{
if (op1 == 'N')
{ {
writeIntoArrayNum += 1; strncat(num1Temp, &strBuffer[i], 1);
} }
else if (!foundEqualSign)
switch (writeIntoArrayNum)
{ {
strncat(num1Temp, &strBuffer[i], 1);
}
else
{
strncat(resultTemp, &strBuffer[i], 1);
}
}
//ak je to nejaky printable symbol ('*/-,:./), skontroluj ci to nie je artimeticke znamienko alebo desatinna bodka (a udel im vynimku)
//AK NIE, povazuj za riadok neplatny...
if (strBuffer[i] == '=')
{
foundEqualSign = true;
continue;
}
if (strBuffer[i] == '+' || strBuffer[i] == '-' || strBuffer[i] == '/' || strBuffer[i] == '*')
{
//predbezna kontrola, ze ci sme doteraz daco vobec nacitavali
if (op1 == 'N' || strBuffer[0] == '\0')
{
isLineInvalid = true;
}
op1 = strBuffer[i];
}
else if (strBuffer[i] == '.')
{
//zisti, kde treba zapisat desatinnu bodku
switch (writeIntoArrayNum)
{
case 1: case 1:
strncat(num1Temp, &strBuffer[i], 1); strncat(num1Temp, &strBuffer[i], 1);
break; break;
@ -86,48 +115,13 @@ int main()
strncat(resultTemp, &strBuffer[i], 1); strncat(resultTemp, &strBuffer[i], 1);
break; break;
} }
continue;
} }
else
if (ispunct(strBuffer[i]) != 0)
{ {
//ak je to nejaky printable symbol ('*/-,:./), skontroluj ci to nie je artimeticke znamienko alebo desatinna bodka (a udel im vynimku) isLineInvalid = true;
//AK NIE, povazuj za riadok neplatny... break;
if (strBuffer[i] == '=')
{
continue;
}
if (strBuffer[i] == '+' || strBuffer[i] == '-' || strBuffer[i] == '/' || strBuffer[i] == '*')
{
op1 = strBuffer[i];
}
else if (strBuffer[i] == '.')
{
//zisti, kde treba zapisat desatinnu bodku
switch (writeIntoArrayNum)
{
case 1:
strncat(num1Temp, &strBuffer[i], 1);
break;
case 2:
strncat(num2Temp, &strBuffer[i], 1);
break;
case 3:
strncat(resultTemp, &strBuffer[i], 1);
break;
}
}
else
{
isLineInvalid = true;
break;
}
continue;
} }
if (isalpha(strBuffer[i]) != 0) if (isalpha(strBuffer[i]) != 0)
{ {