bruno/advent-of-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup old code

Browse Source
This commit is contained in:
Bruno Raoult
2021-07-22 12:10:57 +02:00
parent fa17740a0a
commit 77ad2a6f6e
1 changed files with 6 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
day18/ex12-c.c
View File

@@ -42,10 +42,12 @@ static int prio_1(long op)
{ {
return op==T_PLUS || op==T_MULT? 1: 0; return op==T_PLUS || op==T_MULT? 1: 0;
} }
static int prio_2(long op) static int prio_2(long op)
{ {
return op==T_PLUS? 2: op==T_MULT? 1: 0; return op==T_PLUS? 2: op==T_MULT? 1: 0;
} }
static int (*prio)()=&prio_1; static int (*prio)()=&prio_1;
static long push(struct stack *s, long val) static long push(struct stack *s, long val)
@@ -53,31 +55,22 @@ static long push(struct stack *s, long val)
s->elt[s->last++]=val; s->elt[s->last++]=val;
return val; return val;
} }
static long pop(struct stack *s) static long pop(struct stack *s)
{ {
return s->elt[--s->last]; return s->elt[--s->last];
} }
static long top(struct stack *s) static long top(struct stack *s)
{ {
return s->elt[s->last-1]; return s->elt[s->last-1];
} }
static long empty(struct stack *s) static long empty(struct stack *s)
{ {
return s->last==0; return s->last==0;
} }
static void print() {
int i;
printf("NSTACK: ");
for (i=0; i<nstack.last; ++i) {
printf("%ld ", nstack.elt[i]);
}
printf("\nOSTACK: ");
for (i=0; i<ostack.last; ++i) {
printf("%c ", (char) -ostack.elt[i]);
}
printf("\n");
}
static long get_tok() static long get_tok()
{ {
char *p, c; char *p, c;
@@ -90,7 +83,7 @@ static long get_tok()
case ' ': case ' ':
break; break;
case '(': case '(':
case ')': case ')':
case '*': case '*':
case '+': case '+':
val=-c; val=-c;
@@ -156,16 +149,11 @@ static long eval_expr()
break; break;
} }
res=get_tok(); res=get_tok();
//print();
} }
while(!OEMPTY()) while(!OEMPTY())
eval_top(); eval_top();
// return NSTACK's top
//printf("Returning %ld\n", NTOP());
return NPOP(); return NPOP();
//end:
// return left;
} }
int main(ac, av) int main(ac, av)
@@ -183,19 +171,8 @@ int main(ac, av)
prio=&prio_2; prio=&prio_2;
while (fgets(line, sizeof line, stdin)) { while (fgets(line, sizeof line, stdin)) {
//gets(line, sizeof line, stdin);
//NPUSH(10);
//NPUSH(100);
//NPUSH(1000);
//print();
//printf("TOP=%ld\n", NTOP());
//NPOP();
//print();
saveptr=line; saveptr=line;
//printf("%s", line);
tmp=eval_expr(); tmp=eval_expr();
//printf("%s : res=%ld\n", line, tmp);
res+=tmp; res+=tmp;
} }
printf("%s : res=%ld\n", *av, res); printf("%s : res=%ld\n", *av, res);