Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
prog-1
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Pedro Folloni Pesserl
prog-1
Commits
4172fe4e
Commit
4172fe4e
authored
Dec 15, 2022
by
Pedro Folloni Pesserl
Browse files
Options
Downloads
Patches
Plain Diff
fix wrong format error output
parent
ec877f2c
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
calculadora/calc
+0
-0
0 additions, 0 deletions
calculadora/calc
calculadora/calculadora.c
+8
-5
8 additions, 5 deletions
calculadora/calculadora.c
with
8 additions
and
5 deletions
calculadora/calc
0 → 100755
+
0
−
0
View file @
4172fe4e
File added
This diff is collapsed.
Click to expand it.
calculadora/calculadora.c
+
8
−
5
View file @
4172fe4e
...
...
@@ -46,9 +46,7 @@ int converte_operador(t_operador *op, char c) {
/* Retorna 1 se o operador op1 tem precedencia sobre o operador op2.
Retorna 0 caso contrario. */
int
precedencia_maior_ou_igual
(
t_operador
op1
,
t_operador
op2
)
{
if
(
floor
(
op1
)
>=
floor
(
op2
))
return
1
;
return
0
;
return
floor
(
op1
)
>=
floor
(
op2
);
}
...
...
@@ -173,6 +171,11 @@ int main() {
return
1
;
}
if
(
!
(
isdigit
(
*
c
)
||
*
c
==
'('
))
/* Se o primeiro caracter não for nem um dígito nem um abre parênteses,
o formato está errado. */
erro
(
"formato incorreto"
,
c
-
entrada
+
1
,
&
flag_erro
);
while
(
*
c
!=
'q'
&&
*
c
!=
'\n'
&&
!
flag_erro
)
{
/* Percorre o ponteiro c pela entrada até achar um q, o final da linha ou um erro. */
...
...
@@ -266,9 +269,9 @@ int main() {
}
/* Após o processamento, o resultado final da expressao esta no topo da
pilha de valores. */
pilha de valores.
A pilha deve conter apenas esse valor.
*/
if
(
!
flag_erro
)
{
if
(
!
desempilha
(
&
resultado
,
pilha_valores
))
if
(
!
desempilha
(
&
resultado
,
pilha_valores
)
||
!
pilha_vazia
(
pilha_valores
)
)
erro
(
"formato incorreto"
,
c
-
entrada
+
1
,
&
flag_erro
);
else
{
memoria
=
resultado
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment