diff options
author | Robert Bieber <robby@bieberphoto.com> | 2010-06-07 20:29:46 +0000 |
---|---|---|
committer | Robert Bieber <robby@bieberphoto.com> | 2010-06-07 20:29:46 +0000 |
commit | 0e44ce9bedbea1244ef971b48f38a9c48eecf0f5 (patch) | |
tree | 79b074202ee1d425abbfb5bb2449701a5fba48bc /utils/themeeditor/skin_debug.c | |
parent | bd2ba8068c6cbc58299e98896abd08301a51214f (diff) | |
download | rockbox-0e44ce9bedbea1244ef971b48f38a9c48eecf0f5.tar.gz rockbox-0e44ce9bedbea1244ef971b48f38a9c48eecf0f5.zip |
Theme Editor: Changed anged error reporting method in parser, added error messages to status bar in editor
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26672 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils/themeeditor/skin_debug.c')
-rw-r--r-- | utils/themeeditor/skin_debug.c | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/utils/themeeditor/skin_debug.c b/utils/themeeditor/skin_debug.c index 4d691892ff..4a2ef32206 100644 --- a/utils/themeeditor/skin_debug.c +++ b/utils/themeeditor/skin_debug.c | |||
@@ -31,54 +31,68 @@ | |||
31 | int debug_indent_level = 0; | 31 | int debug_indent_level = 0; |
32 | extern int skin_line; | 32 | extern int skin_line; |
33 | 33 | ||
34 | /* Global error variables */ | ||
35 | int error_line; | ||
36 | char* error_message; | ||
37 | |||
34 | /* Debugging functions */ | 38 | /* Debugging functions */ |
35 | void skin_error(enum skin_errorcode error) | 39 | void skin_error(enum skin_errorcode error) |
36 | { | 40 | { |
37 | 41 | ||
38 | fprintf(stderr, "Error on line %d: ", skin_line); | 42 | error_line = skin_line; |
39 | 43 | ||
40 | switch(error) | 44 | switch(error) |
41 | { | 45 | { |
42 | case MEMORY_LIMIT_EXCEEDED: | 46 | case MEMORY_LIMIT_EXCEEDED: |
43 | fprintf(stderr, "Memory limit exceeded\n"); | 47 | error_message = "Memory limit exceeded"; |
44 | break; | 48 | break; |
45 | case NEWLINE_EXPECTED: | 49 | case NEWLINE_EXPECTED: |
46 | fprintf(stderr, "Newline expected\n"); | 50 | error_message = "Newline expected"; |
47 | break; | 51 | break; |
48 | case ILLEGAL_TAG: | 52 | case ILLEGAL_TAG: |
49 | fprintf(stderr, "Illegal tag\n"); | 53 | error_message = "Illegal tag"; |
50 | break; | 54 | break; |
51 | case ARGLIST_EXPECTED: | 55 | case ARGLIST_EXPECTED: |
52 | fprintf(stderr, "Argument list expected\n"); | 56 | error_message = "Argument list expected"; |
53 | break; | 57 | break; |
54 | case TOO_MANY_ARGS: | 58 | case TOO_MANY_ARGS: |
55 | fprintf(stderr, "Too many arguments given\n"); | 59 | error_message = "Too many arguments given"; |
56 | break; | 60 | break; |
57 | case DEFAULT_NOT_ALLOWED: | 61 | case DEFAULT_NOT_ALLOWED: |
58 | fprintf(stderr, "Argument can not be set to default\n"); | 62 | error_message = "Argument can not be set to default"; |
59 | break; | 63 | break; |
60 | case UNEXPECTED_NEWLINE: | 64 | case UNEXPECTED_NEWLINE: |
61 | fprintf(stderr, "Unexpected newline\n"); | 65 | error_message = "Unexpected newline"; |
62 | break; | 66 | break; |
63 | case INSUFFICIENT_ARGS: | 67 | case INSUFFICIENT_ARGS: |
64 | fprintf(stderr, "Not enough arguments\n"); | 68 | error_message = "Not enough arguments"; |
65 | break; | 69 | break; |
66 | case INT_EXPECTED: | 70 | case INT_EXPECTED: |
67 | fprintf(stderr, "Expected integer\n"); | 71 | error_message = "Expected integer"; |
68 | break; | 72 | break; |
69 | case SEPERATOR_EXPECTED: | 73 | case SEPERATOR_EXPECTED: |
70 | fprintf(stderr, "Expected argument seperator\n"); | 74 | error_message = "Expected argument seperator"; |
71 | break; | 75 | break; |
72 | case CLOSE_EXPECTED: | 76 | case CLOSE_EXPECTED: |
73 | fprintf(stderr, "Expected list close\n"); | 77 | error_message = "Expected list close"; |
74 | break; | 78 | break; |
75 | case MULTILINE_EXPECTED: | 79 | case MULTILINE_EXPECTED: |
76 | fprintf(stderr, "Expected subline seperator\n"); | 80 | error_message = "Expected subline seperator"; |
77 | break; | 81 | break; |
78 | }; | 82 | }; |
79 | 83 | ||
80 | } | 84 | } |
81 | 85 | ||
86 | int skin_error_line() | ||
87 | { | ||
88 | return error_line; | ||
89 | } | ||
90 | |||
91 | char* skin_error_message() | ||
92 | { | ||
93 | return error_message; | ||
94 | } | ||
95 | |||
82 | void skin_debug_tree(struct skin_element* root) | 96 | void skin_debug_tree(struct skin_element* root) |
83 | { | 97 | { |
84 | int i; | 98 | int i; |