diff options
Diffstat (limited to 'src/data/tree.c')
| -rw-r--r-- | src/data/tree.c | 86 |
1 files changed, 24 insertions, 62 deletions
diff --git a/src/data/tree.c b/src/data/tree.c index 67f0b15..c55dcf1 100644 --- a/src/data/tree.c +++ b/src/data/tree.c @@ -1,14 +1,13 @@ /*:* *: File: ./src/data/tree.c - *: A simple interpreter - *: - *: WWW : http://fype.buetow.org - *: AUTHOR : http://paul.buetow.org - *: E-Mail : fype at dev.buetow.org - *: - *: Copyright (c) 2005 - 2009, Dipl.-Inform. (FH) Paul C. Buetow - *: All rights reserved. - *: + *: A simple Fype interpreter + *: + *: WWW: http://fype.buetow.org + *: AUTHOR: http://paul.buetow.org + *: E-Mail: fype at dev.buetow.org + *: + *: The Fype Language; (c) 2005 - 2010 - Dipl.-Inform. (FH) Paul C. Buetow + *: *: Redistribution and use in source and binary forms, with or without modi- *: fication, are permitted provided that the following conditions are met: *: * Redistributions of source code must retain the above copyright @@ -16,20 +15,20 @@ *: * Redistributions in binary form must reproduce the above copyright *: notice, this list of conditions and the following disclaimer in the *: documentation and/or other materials provided with the distribution. - *: * Neither the name of buetow.org nor the names of its contributors may - *: be used to endorse or promote products derived from this software + *: * Neither the name of buetow.org nor the names of its contributors may + *: be used to endorse or promote products derived from this software *: without specific prior written permission. - *: - *: THIS SOFTWARE IS PROVIDED BY PAUL C. BUETOW AS IS'' AND ANY EXPRESS OR - *: IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + *: + *: THIS SOFTWARE IS PROVIDED BY PAUL C. BUETOW AS IS'' AND ANY EXPRESS OR + *: IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED *: WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - *: DISCLAIMED. IN NO EVENT SHALL PAUL C. BUETOW BE LIABLE FOR ANY DIRECT, - *: INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - *: (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - *: SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + *: DISCLAIMED. IN NO EVENT SHALL PAUL C. BUETOW BE LIABLE FOR ANY DIRECT, + *: INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + *: (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + *: SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) *: HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - *: STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - *: IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + *: STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + *: IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE *: POSSIBILITY OF SUCH DAMAGE. *:*/ @@ -76,56 +75,19 @@ _tree_print_cb(void *p_void, void *p_indent) { TreeNode *ptn = p_void; _indent((int) p_indent); -#ifdef FYPE - TokenType tt = (TokenType) treenode_get_val(ptn); - - if (IS_NOT_TERMINAL(tt)) - goto no_token_val; - - Token *p_token = treenode_get_val2(ptn); - - if (!p_token) - goto no_token_val; - - char *c_token_val = token_get_val(p_token); - TokenType tt_token = token_get_tt(p_token); - - if (!c_token_val) - c_token_val = ""; - - printf(" %s=%s", tt_get_name(tt_token), c_token_val); - return; - -no_token_val: - printf(" %s", tt_get_name(tt)); - -#else printf(" %d", (int) treenode_get_val(ptn)); -#endif } void _tree_print(TreeNode *p_treenode, int i_indent) { - TokenType tt = (TokenType)treenode_get_val(p_treenode); - -#ifdef FYPE - _Bool b_print_nl = false; - if (IS_NOT_TERMINAL(tt)) { - _indent(i_indent); - printf("%s:", tt_get_name(tt)); - b_print_nl = true; - } -#else - _indent(i_indent); - printf("%s:", tt_get_name(tt)); -#endif + //TokenType tt = (TokenType)treenode_get_val(p_treenode); + + //_indent(i_indent); + //printf("%s:", tt_get_name(tt)); array_iterate2(p_treenode->p_array_childs, _tree_print_cb, (void*) 0); -#ifdef FYPE - if (b_print_nl) -#endif - printf("\nTree "); + printf("\nTree "); array_iterate2(p_treenode->p_array_childs, _tree_print_cb2, |