Mercurial > baum

annotate baum.c @ 33:2e564bf8599c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new error code 6; more readable printTree; cleanups
author meillo@marmaro.de
date Sat, 01 Mar 2008 17:36:59 +0100
parents 4e60d96265f0
children e986c6abed2b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
1 /*
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
2 * baum - an esoteric programming language
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
3 *
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
4 * (c) markus schnalke <meillo@marmaro.de>
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
5 * and julian forster
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
6 *
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
7 */
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
8
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
9
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
10 #include <stdio.h>
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
11 #include <stdlib.h>
1
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
12 #include <string.h>
0
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
13
1
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
14 #include "baum.h"
2
557fa4df2bcd added difference between char and number
meillo@marmaro.de
parents: 1
diff changeset
15 #include "actions.h"
1
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
16
29
88a51653db83 removed binary from dist tarball; new debian package
meillo@marmaro.de
parents: 27
diff changeset
17 #define VERSION "0.2"
13
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
18
30
cd979b979610 fixed multiple (un)indentions in read_input; some better comments
meillo@marmaro.de
parents: 29
diff changeset
19
13
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
20 int option_verbose = 0;
0
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
21
5
c202ccccedb5 added checks for null pointer; print echoes as char or number now (depends on value); all logging goes to stderr now; new nodes blackhole and times (not implemented yet)
meillo@marmaro.de
parents: 4
diff changeset
22 struct Node* root = 0;
10
0e15841ae111 s/list/stack/g because thats what it is
meillo@marmaro.de
parents: 9
diff changeset
23 struct Stackitem* stack = NULL;
0
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
24
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
25
33
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
26 void printNode(struct Node* node, int level);
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
27 void printTree(struct Node* root, int level);
26
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
28 struct Node* lastNode(struct Node* node);
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
29 void delete(struct Node* node);
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
30
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
31
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
32
1
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
33 void logit(char* text) {
13
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
34 if (option_verbose) {
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
35 fprintf(stderr, "[%s]\n", text);
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
36 }
1
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
37 }
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
38
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
39
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
40 /* new */
3
15d7d6b9766f added input; added nextNode, lastNode, insertLast
meillo@marmaro.de
parents: 2
diff changeset
41 struct Node* newNode(char* name, unsigned char value) {
0
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
42 struct Node* node;
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
43 node = (struct Node*) malloc(sizeof(struct Node));
9
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
44 strcpy(node->name, name);
3
15d7d6b9766f added input; added nextNode, lastNode, insertLast
meillo@marmaro.de
parents: 2
diff changeset
45 node->value = value;
0
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
46 node->right = 0;
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
47 node->down = 0;
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
48 return node;
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
49 }
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
50
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
51
3
15d7d6b9766f added input; added nextNode, lastNode, insertLast
meillo@marmaro.de
parents: 2
diff changeset
52
15d7d6b9766f added input; added nextNode, lastNode, insertLast
meillo@marmaro.de
parents: 2
diff changeset
53 struct Node* lastNode(struct Node* node) {
15d7d6b9766f added input; added nextNode, lastNode, insertLast
meillo@marmaro.de
parents: 2
diff changeset
54 while (node->right != NULL) {
15d7d6b9766f added input; added nextNode, lastNode, insertLast
meillo@marmaro.de
parents: 2
diff changeset
55 node = node->right;
15d7d6b9766f added input; added nextNode, lastNode, insertLast
meillo@marmaro.de
parents: 2
diff changeset
56 }
15d7d6b9766f added input; added nextNode, lastNode, insertLast
meillo@marmaro.de
parents: 2
diff changeset
57 return node;
15d7d6b9766f added input; added nextNode, lastNode, insertLast
meillo@marmaro.de
parents: 2
diff changeset
58 }
15d7d6b9766f added input; added nextNode, lastNode, insertLast
meillo@marmaro.de
parents: 2
diff changeset
59
15
e2048e569891 insertLast returns now new inserted node; very dumb implementation for action_times
meillo@marmaro.de
parents: 13
diff changeset
60 struct Node* insertLast(struct Node* node, struct Node* insert) {
3
15d7d6b9766f added input; added nextNode, lastNode, insertLast
meillo@marmaro.de
parents: 2
diff changeset
61 node = lastNode(node);
15d7d6b9766f added input; added nextNode, lastNode, insertLast
meillo@marmaro.de
parents: 2
diff changeset
62 node->right = insert;
15
e2048e569891 insertLast returns now new inserted node; very dumb implementation for action_times
meillo@marmaro.de
parents: 13
diff changeset
63 return insert;
3
15d7d6b9766f added input; added nextNode, lastNode, insertLast
meillo@marmaro.de
parents: 2
diff changeset
64 }
15d7d6b9766f added input; added nextNode, lastNode, insertLast
meillo@marmaro.de
parents: 2
diff changeset
65
26
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
66
1
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
67 /* delete */
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
68 void delete(struct Node* node) {
26
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
69 if (node == NULL) {
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
70 return;
0
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
71 }
33
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
72 delete(node->down);
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
73 delete(node->right);
26
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
74 free(node); node=0;
0
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
75 }
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
76
1
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
77
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
78 /* print */
33
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
79 void printNode(struct Node* node, int level) {
5
c202ccccedb5 added checks for null pointer; print echoes as char or number now (depends on value); all logging goes to stderr now; new nodes blackhole and times (not implemented yet)
meillo@marmaro.de
parents: 4
diff changeset
80 if (node != NULL) {
33
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
81 while (level-- > 0) {
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
82 fprintf(stderr, "\t");
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
83 }
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
84 fprintf(stderr, "%s (%d|%c)\n", node->name, node->value, node->value);
5
c202ccccedb5 added checks for null pointer; print echoes as char or number now (depends on value); all logging goes to stderr now; new nodes blackhole and times (not implemented yet)
meillo@marmaro.de
parents: 4
diff changeset
85 }
0
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
86 }
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
87
33
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
88 void printTree(struct Node* root, int level) {
26
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
89 if (root == NULL) {
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
90 return;
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
91 }
33
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
92 printNode(root, level);
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
93 printTree(root->down, level+1);
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
94 printTree(root->right, level);
0
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
95 }
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
96
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
97
1
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
98
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
99
3
15d7d6b9766f added input; added nextNode, lastNode, insertLast
meillo@marmaro.de
parents: 2
diff changeset
100
30
cd979b979610 fixed multiple (un)indentions in read_input; some better comments
meillo@marmaro.de
parents: 29
diff changeset
101 /* stack for read_input */
9
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
102 void push(struct Node* node) {
10
0e15841ae111 s/list/stack/g because thats what it is
meillo@marmaro.de
parents: 9
diff changeset
103 struct Stackitem* tmp;
0e15841ae111 s/list/stack/g because thats what it is
meillo@marmaro.de
parents: 9
diff changeset
104 struct Stackitem* new;
0e15841ae111 s/list/stack/g because thats what it is
meillo@marmaro.de
parents: 9
diff changeset
105 new = (struct Stackitem*) malloc(sizeof(struct Stackitem));
9
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
106 new->node = node;
10
0e15841ae111 s/list/stack/g because thats what it is
meillo@marmaro.de
parents: 9
diff changeset
107 tmp = stack;
0e15841ae111 s/list/stack/g because thats what it is
meillo@marmaro.de
parents: 9
diff changeset
108 stack = new;
0e15841ae111 s/list/stack/g because thats what it is
meillo@marmaro.de
parents: 9
diff changeset
109 stack->next = tmp;
1
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
110 }
9
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
111 struct Node* pull() {
10
0e15841ae111 s/list/stack/g because thats what it is
meillo@marmaro.de
parents: 9
diff changeset
112 if (stack == NULL) {
9
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
113 return NULL;
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
114 }
10
0e15841ae111 s/list/stack/g because thats what it is
meillo@marmaro.de
parents: 9
diff changeset
115 struct Stackitem* tmp;
9
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
116 struct Node* node;
10
0e15841ae111 s/list/stack/g because thats what it is
meillo@marmaro.de
parents: 9
diff changeset
117 tmp = stack;
0e15841ae111 s/list/stack/g because thats what it is
meillo@marmaro.de
parents: 9
diff changeset
118 stack = stack->next;
9
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
119 node = tmp->node;
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
120 free(tmp); tmp=0;
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
121 return node;
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
122 }
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
123
1
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
124
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
125
6
ab87b154a96b first tries for the read input function
meillo@marmaro.de
parents: 5
diff changeset
126 /* read input */
12
8e34daa80f64 input is now read from file again (because of input node)
meillo@marmaro.de
parents: 10
diff changeset
127 void read_input(char* filename) {
7
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
128 int c;
8
495a56e706dc input is now read from stdin
meillo@marmaro.de
parents: 7
diff changeset
129 int indent;
7
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
130 char name[256];
6
ab87b154a96b first tries for the read input function
meillo@marmaro.de
parents: 5
diff changeset
131 int value;
9
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
132 int last_indent;
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
133 struct Node* last_node;
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
134 struct Node* node;
12
8e34daa80f64 input is now read from file again (because of input node)
meillo@marmaro.de
parents: 10
diff changeset
135 FILE* file;
6
ab87b154a96b first tries for the read input function
meillo@marmaro.de
parents: 5
diff changeset
136
8
495a56e706dc input is now read from stdin
meillo@marmaro.de
parents: 7
diff changeset
137 indent = 0;
495a56e706dc input is now read from stdin
meillo@marmaro.de
parents: 7
diff changeset
138 strcpy(name, "");
495a56e706dc input is now read from stdin
meillo@marmaro.de
parents: 7
diff changeset
139 value = 0;
9
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
140 last_indent = -1;
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
141 root = newNode("blackhole", 0);
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
142 last_node = root;
12
8e34daa80f64 input is now read from file again (because of input node)
meillo@marmaro.de
parents: 10
diff changeset
143 file = fopen(filename, "r");
6
ab87b154a96b first tries for the read input function
meillo@marmaro.de
parents: 5
diff changeset
144
12
8e34daa80f64 input is now read from file again (because of input node)
meillo@marmaro.de
parents: 10
diff changeset
145 while ((c = getc(file)) != EOF) {
8
495a56e706dc input is now read from stdin
meillo@marmaro.de
parents: 7
diff changeset
146 if (c == '#') { /* comment */
12
8e34daa80f64 input is now read from file again (because of input node)
meillo@marmaro.de
parents: 10
diff changeset
147 while ((c = getc(file)) != '\n') {
7
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
148 }
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
149 }
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
150
8
495a56e706dc input is now read from stdin
meillo@marmaro.de
parents: 7
diff changeset
151 if (c == ' ' || c == '\t') { /* indent if at start of line */
495a56e706dc input is now read from stdin
meillo@marmaro.de
parents: 7
diff changeset
152 if (strlen(name) == 0) {
495a56e706dc input is now read from stdin
meillo@marmaro.de
parents: 7
diff changeset
153 indent++;
495a56e706dc input is now read from stdin
meillo@marmaro.de
parents: 7
diff changeset
154 }
7
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
155 }
6
ab87b154a96b first tries for the read input function
meillo@marmaro.de
parents: 5
diff changeset
156
8
495a56e706dc input is now read from stdin
meillo@marmaro.de
parents: 7
diff changeset
157 if (c == '\n') { /* end of line: create node */
7
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
158 if (strlen(name) > 0) {
13
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
159 if (option_verbose) {
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
160 fprintf(stderr, " %d - %s - %d\n", indent, name, value);
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
161 }
8
495a56e706dc input is now read from stdin
meillo@marmaro.de
parents: 7
diff changeset
162 /* create node */
9
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
163 node = newNode((char*) name, value);
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
164 if (indent > last_indent) { /* down */
30
cd979b979610 fixed multiple (un)indentions in read_input; some better comments
meillo@marmaro.de
parents: 29
diff changeset
165 /* if it goes more than one level down -> error */
33
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
166 if (indent > last_indent + 1) {
30
cd979b979610 fixed multiple (un)indentions in read_input; some better comments
meillo@marmaro.de
parents: 29
diff changeset
167 fprintf(stderr, "error: Indention over more than one level. Only indent by one!\n");
31
4e60d96265f0 removed -c option completely; updated man page; new error code 5
meillo@marmaro.de
parents: 30
diff changeset
168 exit(5);
30
cd979b979610 fixed multiple (un)indentions in read_input; some better comments
meillo@marmaro.de
parents: 29
diff changeset
169 }
9
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
170 last_node->down = node;
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
171 push(last_node);
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
172 } else if (indent == last_indent) { /* right */
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
173 last_node->right = node;
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
174 } else if (indent < last_indent) { /* up */
30
cd979b979610 fixed multiple (un)indentions in read_input; some better comments
meillo@marmaro.de
parents: 29
diff changeset
175 /* handle if it goes more than one level up */
cd979b979610 fixed multiple (un)indentions in read_input; some better comments
meillo@marmaro.de
parents: 29
diff changeset
176 while (indent < last_indent) {
cd979b979610 fixed multiple (un)indentions in read_input; some better comments
meillo@marmaro.de
parents: 29
diff changeset
177 last_node = pull();
cd979b979610 fixed multiple (un)indentions in read_input; some better comments
meillo@marmaro.de
parents: 29
diff changeset
178 last_indent--;
cd979b979610 fixed multiple (un)indentions in read_input; some better comments
meillo@marmaro.de
parents: 29
diff changeset
179 }
9
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
180 last_node->right = node;
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
181 }
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
182 last_indent = indent;
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
183 last_node = node;
6
ab87b154a96b first tries for the read input function
meillo@marmaro.de
parents: 5
diff changeset
184 }
ab87b154a96b first tries for the read input function
meillo@marmaro.de
parents: 5
diff changeset
185 indent = 0;
ab87b154a96b first tries for the read input function
meillo@marmaro.de
parents: 5
diff changeset
186 strcpy(name, "");
ab87b154a96b first tries for the read input function
meillo@marmaro.de
parents: 5
diff changeset
187 value = 0;
ab87b154a96b first tries for the read input function
meillo@marmaro.de
parents: 5
diff changeset
188 }
7
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
189
8
495a56e706dc input is now read from stdin
meillo@marmaro.de
parents: 7
diff changeset
190 if (c >= 'a' && c <= 'z') { /* name */
7
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
191 int i = 1;
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
192 name[0] = (char) c;
12
8e34daa80f64 input is now read from file again (because of input node)
meillo@marmaro.de
parents: 10
diff changeset
193 while ((c = getc(file)) != '(') {
7
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
194 name[i] = (char) c;
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
195 i++;
8
495a56e706dc input is now read from stdin
meillo@marmaro.de
parents: 7
diff changeset
196 if (i > 255) {
33
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
197 fprintf(stderr, "error: node name too long, or no value given\n");
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
198 exit(6);
8
495a56e706dc input is now read from stdin
meillo@marmaro.de
parents: 7
diff changeset
199 }
7
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
200 }
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
201 name[i] = '\0';
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
202 }
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
203
8
495a56e706dc input is now read from stdin
meillo@marmaro.de
parents: 7
diff changeset
204 if (c == '(') { /* value */
12
8e34daa80f64 input is now read from file again (because of input node)
meillo@marmaro.de
parents: 10
diff changeset
205 fscanf(file, "%d)", &value);
7
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
206 }
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
207
6
ab87b154a96b first tries for the read input function
meillo@marmaro.de
parents: 5
diff changeset
208 }
7
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
209
30
cd979b979610 fixed multiple (un)indentions in read_input; some better comments
meillo@marmaro.de
parents: 29
diff changeset
210 /* clear stack */
27
1c3dd1e88bdf empty stack at the end (thanks valgrind to show me this)
meillo@marmaro.de
parents: 26
diff changeset
211 while (stack != NULL) {
1c3dd1e88bdf empty stack at the end (thanks valgrind to show me this)
meillo@marmaro.de
parents: 26
diff changeset
212 pull();
1c3dd1e88bdf empty stack at the end (thanks valgrind to show me this)
meillo@marmaro.de
parents: 26
diff changeset
213 }
1c3dd1e88bdf empty stack at the end (thanks valgrind to show me this)
meillo@marmaro.de
parents: 26
diff changeset
214
12
8e34daa80f64 input is now read from file again (because of input node)
meillo@marmaro.de
parents: 10
diff changeset
215 fclose(file);
26
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
216 }
12
8e34daa80f64 input is now read from file again (because of input node)
meillo@marmaro.de
parents: 10
diff changeset
217
26
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
218
6
ab87b154a96b first tries for the read input function
meillo@marmaro.de
parents: 5
diff changeset
219
1
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
220 /* main */
0
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
221 int main(int argc, char* argv[]) {
7
6a6152cf63f7 new implementation of the read input function
meillo@marmaro.de
parents: 6
diff changeset
222 unsigned char shell_return = 0;
9
c020b0d1cfca read input is now finished in first version; removed init; added push and pull; name is now array instead of pointer
meillo@marmaro.de
parents: 8
diff changeset
223
13
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
224 while (--argc > 0 && (*++argv)[0] == '-') {
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
225 if (strcmp(argv[0], "--version") == 0) {
26
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
226 printf("\
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
227 baum %s\n\
13
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
228 an esoteric programming language\n\
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
229 by markus schnalke and julian forster\n\
26
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
230 http://prog.marmaro.de/baum\n\
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
231 ", VERSION);
13
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
232 exit(0);
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
233 } else if (strcmp(argv[0], "--help") == 0) {
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
234 printf("\
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
235 baum --version print version information and exit\n\
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
236 baum --help print this output\n\
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
237 baum [-v] <file> (verbosly) run file\n\
26
f0856c177403 removed obsolete stuff; only relevant stuff is extern now; refactoring
meillo@marmaro.de
parents: 15
diff changeset
238 ");
13
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
239 exit(0);
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
240 } else if (strcmp(argv[0], "-v") == 0) {
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
241 option_verbose = 1;
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
242 /*
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
243 } else if (strcmp(argv[0], "-W") == 0) {
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
244 / * TODO: catch if no value given * /
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
245 iDWarn = atoi((++argv)[0]);
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
246 argc--;
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
247 */
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
248 } else {
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
249 fprintf(stderr, "unknown option: %s\n", argv[0]);
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
250 exit(127);
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
251 }
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
252 }
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
253
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
254 if (argc != 1) {
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
255 fprintf(stderr, "%d source files given, please specify one.\n", argc);
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
256 exit(3);
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
257 }
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
258
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
259 read_input(argv[0]);
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
260
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
261 if (option_verbose) {
33
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
262 printTree(root, 0);
13
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
263 }
1
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
264
5
c202ccccedb5 added checks for null pointer; print echoes as char or number now (depends on value); all logging goes to stderr now; new nodes blackhole and times (not implemented yet)
meillo@marmaro.de
parents: 4
diff changeset
265 shell_return = action(root);
1
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
266
13
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
267 if (option_verbose) {
33
2e564bf8599c new error code 6; more readable printTree; cleanups
meillo@marmaro.de
parents: 31
diff changeset
268 printTree(root, 0);
13
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
269 }
bf660b45bba9 added commandline options (-v, -c, file); logging only if -v is set
meillo@marmaro.de
parents: 12
diff changeset
270
1
3da0ff17c8e7 added features (print, sum, number); split in header file
meillo@marmaro.de
parents: 0
diff changeset
271 delete(root);
5
c202ccccedb5 added checks for null pointer; print echoes as char or number now (depends on value); all logging goes to stderr now; new nodes blackhole and times (not implemented yet)
meillo@marmaro.de
parents: 4
diff changeset
272 exit(shell_return);
0
2f71d692d4f9 initial commit
meillo@marmaro.de
parents:
diff changeset
273 }