diff --git a/a1/program.c b/a1/program.c index 9549185..9bb6048 100644 --- a/a1/program.c +++ b/a1/program.c @@ -18,16 +18,16 @@ int main() //scanning faza programu vstup = getchar(); + vysChar = vstup; if (vstup == -1) { break;} //ak EOF (End Of File), resp. koniec suboru + if (vstup == '\n') // ak NewLine char, resp. koniec riadku { pocetRiadkov += 1; - mozeBytPrinted = false; } - //ak vstup == malemu pismenu - if (GetTypZnaku(vstup) == 0) + else if (GetTypZnaku(vstup) == 0) { vysChar = toupper(vstup); } @@ -36,22 +36,22 @@ int main() { vysChar = tolower(vstup); } - //ak NIE je to pismeno (a zaroven NIE koniec riadku - resp. NewLine character) + //ak to nie je neviditelny char (resp. riadiaci/control) a NIE je NewLine else if (GetTypZnaku(vstup) == 2 && vstup != '\n') { mozeBytPrinted = false; } - //output charakteru (ak je teda charakter...) + //output vidtelnehok charakteru if (mozeBytPrinted) { putchar(vysChar);} } - printf("%d", pocetRiadkov); + printf("%d\n", pocetRiadkov); return 0; } int GetTypZnaku(int vstup) { if (islower(vstup) != 0) { return 0;} if (isupper(vstup) != 0) { return 1;} - if (isalpha(vstup) == 0) { return 2;} + if (iscntrl(vstup) != 0) { return 2;} return -1; } \ No newline at end of file diff --git a/du1/program.c b/du1/program.c index 159ef71..9df691b 100644 --- a/du1/program.c +++ b/du1/program.c @@ -18,16 +18,16 @@ int main() //scanning faza programu vstup = getchar(); + vysChar = vstup; if (vstup == -1) { break;} //ak EOF (End Of File), resp. koniec suboru + if (vstup == '\n') // ak NewLine char, resp. koniec riadku { pocetRiadkov += 1; - mozeBytPrinted = false; } - //ak vstup == malemu pismenu - if (GetTypZnaku(vstup) == 0) + else if (GetTypZnaku(vstup) == 0) { vysChar = toupper(vstup); } @@ -36,22 +36,22 @@ int main() { vysChar = tolower(vstup); } - //ak NIE je to pismeno (a zaroven NIE koniec riadku - resp. NewLine character) + //ak to nie je neviditelny char (resp. riadiaci/control) a NIE je NewLine else if (GetTypZnaku(vstup) == 2 && vstup != '\n') { mozeBytPrinted = false; } - //output charakteru (ak je teda charakter...) + //output vidtelnehok charakteru if (mozeBytPrinted) { putchar(vysChar);} } - printf("%d", pocetRiadkov); + printf("%d\n", pocetRiadkov); return 0; } int GetTypZnaku(int vstup) { if (islower(vstup) != 0) { return 0;} if (isupper(vstup) != 0) { return 1;} - if (isalpha(vstup) == 0) { return 2;} + if (iscntrl(vstup) != 0) { return 2;} return -1; } \ No newline at end of file