1.1 --- a/semantics.c Mon Aug 26 05:43:49 2002 +0000 1.2 +++ b/semantics.c Mon Aug 26 06:03:55 2002 +0000 1.3 @@ -1,8 +1,9 @@ 1.4 +#include <stdbool.h> 1.5 +#include <stdint.h> 1.6 #include <stdlib.h> 1.7 #include <string.h> 1.8 #include <stdio.h> 1.9 1.10 -#include "type.h" 1.11 #include "semantics.h" 1.12 #include "parser.tab.h" 1.13 #include "t2p.h" 1.14 @@ -10,13 +11,13 @@ 1.15 1.16 typedef struct 1.17 { 1.18 - boolean has_page_size; 1.19 + bool has_page_size; 1.20 page_size_t page_size; 1.21 1.22 - boolean has_rotation; 1.23 + bool has_rotation; 1.24 int rotation; 1.25 1.26 - boolean has_crop; 1.27 + bool has_crop; 1.28 crop_t crop; 1.29 } input_modifiers_t; 1.30 1.31 @@ -57,7 +58,7 @@ 1.32 bookmark_t *first_bookmark; 1.33 bookmark_t *last_bookmark; 1.34 1.35 - boolean has_page_label; 1.36 + bool has_page_label; 1.37 page_label_t page_label; 1.38 } output_context_t; 1.39 1.40 @@ -432,9 +433,9 @@ 1.41 exit (2); 1.42 } 1.43 1.44 -static boolean get_input_rotation (input_context_t *context, 1.45 - input_modifier_type_t type, 1.46 - int *rotation) 1.47 +static bool get_input_rotation (input_context_t *context, 1.48 + input_modifier_type_t type, 1.49 + int *rotation) 1.50 { 1.51 for (; context; context = context->parent) 1.52 { 1.53 @@ -452,9 +453,9 @@ 1.54 return (0); /* default */ 1.55 } 1.56 1.57 -static boolean get_input_page_size (input_context_t *context, 1.58 - input_modifier_type_t type, 1.59 - page_size_t *page_size) 1.60 +static bool get_input_page_size (input_context_t *context, 1.61 + input_modifier_type_t type, 1.62 + page_size_t *page_size) 1.63 { 1.64 for (; context; context = context->parent) 1.65 { 1.66 @@ -510,7 +511,7 @@ 1.67 for (i = image->range.first; i <= image->range.last; i++) 1.68 { 1.69 input_modifier_type_t parity = (i % 2) ? INPUT_MODIFIER_ODD : INPUT_MODIFIER_EVEN; 1.70 - boolean has_rotation, has_page_size; 1.71 + bool has_rotation, has_page_size; 1.72 int rotation; 1.73 page_size_t page_size; 1.74 1.75 @@ -571,9 +572,9 @@ 1.76 } 1.77 1.78 1.79 -boolean parse_spec_file (char *fn) 1.80 +bool parse_spec_file (char *fn) 1.81 { 1.82 - boolean result = 0; 1.83 + bool result = 0; 1.84 1.85 yyin = fopen (fn, "r"); 1.86 if (! yyin) 1.87 @@ -617,7 +618,7 @@ 1.88 } 1.89 1.90 1.91 -boolean process_specs (void) 1.92 +bool process_specs (void) 1.93 { 1.94 input_image_t *image = NULL; 1.95 output_page_t *page = NULL;