diff options
| author | xi <xi@18f92427-320e-0410-9341-c67f048884a3> | 2007-12-26 13:46:43 +0000 |
|---|---|---|
| committer | xi <xi@18f92427-320e-0410-9341-c67f048884a3> | 2007-12-26 13:46:43 +0000 |
| commit | 44cb6cad502da4fbf4bbf9c5a381fe37d840e7e6 (patch) | |
| tree | baaa3f7b3fe6beb1f2d661366381fd2bd74a3a34 /src/yaml_private.h | |
| parent | 0b2da39c84579f071da6cbfdf61bf04228ca4498 (diff) | |
| download | libyaml-44cb6cad502da4fbf4bbf9c5a381fe37d840e7e6.tar.gz | |
Updated reader.c to use the new API.
git-svn-id: http://svn.pyyaml.org/libyaml/trunk@262 18f92427-320e-0410-9341-c67f048884a3
Diffstat (limited to 'src/yaml_private.h')
| -rw-r--r-- | src/yaml_private.h | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/src/yaml_private.h b/src/yaml_private.h index 8fe55f0..61f071e 100644 --- a/src/yaml_private.h +++ b/src/yaml_private.h @@ -28,9 +28,9 @@ yaml_strdup(const yaml_char_t *); * Error management. */ -#define MEMORY_ERROR_INIT(error) \ +#define ERROR_INIT(error,error_type) \ (memset(&(error), 0, sizeof(error)), \ - (error).type = YAML_MEMORY_ERROR, \ + (error).type = (error_type), \ 0) #define READING_ERROR_INIT(error,error_type,error_problem,error_offset,error_value) \ @@ -74,38 +74,41 @@ yaml_strdup(const yaml_char_t *); (error).type.dumping.problem = (error_problem), \ 0) -#define READER_ERROR_INIT(error,problem,offset) \ - READING_ERROR_INIT(error,YAML_READER_ERROR,problem,offset,-1) +#define MEMORY_ERROR_INIT(self) \ + ERROR_INIT((self)->error,YAML_MEMORY_ERROR) + +#define READER_ERROR_INIT(self,problem,offset) \ + READING_ERROR_INIT((self)->error,YAML_READER_ERROR,problem,offset,-1) -#define DECODER_ERROR_INIT(error,problem,offset,value) \ - READING_ERROR_INIT(error,YAML_DECODER_ERROR,problem,offset,value) +#define DECODER_ERROR_INIT(self,problem,offset,value) \ + READING_ERROR_INIT((self)->error,YAML_DECODER_ERROR,problem,offset,value) -#define SCANNER_ERROR_INIT(error,problem,problem_mark) \ - LOADING_ERROR_INIT(error,YAML_SCANNER_ERROR,problem,problem_mark) +#define SCANNER_ERROR_INIT(self,problem,problem_mark) \ + LOADING_ERROR_INIT((self)->error,YAML_SCANNER_ERROR,problem,problem_mark) -#define SCANNER_ERROR_WITH_CONTEXT_INIT(error,context,context_mark,problem,problem_mark) \ - LOADING_ERROR_WITH_CONTEXT_INIT(error,YAML_SCANNER_ERROR,context,context_mark,problem,problem_mark) +#define SCANNER_ERROR_WITH_CONTEXT_INIT(self,context,context_mark,problem,problem_mark) \ + LOADING_ERROR_WITH_CONTEXT_INIT((self)->error,YAML_SCANNER_ERROR,context,context_mark,problem,problem_mark) -#define PARSER_ERROR_INIT(error,problem,problem_mark) \ - LOADING_ERROR_INIT(error,YAML_PARSER_ERROR,problem,problem_mark) +#define PARSER_ERROR_INIT(self,problem,problem_mark) \ + LOADING_ERROR_INIT((self)->error,YAML_PARSER_ERROR,problem,problem_mark) -#define PARSER_ERROR_WITH_CONTEXT_INIT(error,context,context_mark,problem,problem_mark) \ - LOADING_ERROR_WITH_CONTEXT_INIT(error,YAML_PARSER_ERROR,context,context_mark,problem,problem_mark) +#define PARSER_ERROR_WITH_CONTEXT_INIT(self,context,context_mark,problem,problem_mark) \ + LOADING_ERROR_WITH_CONTEXT_INIT((self)->error,YAML_PARSER_ERROR,context,context_mark,problem,problem_mark) -#define COMPOSER_ERROR_INIT(error,problem,problem_mark) \ - LOADING_ERROR_INIT(error,YAML_COMPOSER_ERROR,problem,problem_mark) +#define COMPOSER_ERROR_INIT(self,problem,problem_mark) \ + LOADING_ERROR_INIT((self)->error,YAML_COMPOSER_ERROR,problem,problem_mark) -#define COMPOSER_ERROR_WITH_CONTEXT_INIT(error,context,context_mark,problem,problem_mark) \ - LOADING_ERROR_WITH_CONTEXT_INIT(error,YAML_COMPOSER_ERROR,context,context_mark,problem,problem_mark) +#define COMPOSER_ERROR_WITH_CONTEXT_INIT(self,context,context_mark,problem,problem_mark) \ + LOADING_ERROR_WITH_CONTEXT_INIT((self)->error,YAML_COMPOSER_ERROR,context,context_mark,problem,problem_mark) -#define WRITER_ERROR_INIT(error,problem,offset) \ - WRITING_ERROR_INIT(error,YAML_WRITER_ERROR,problem,offset) +#define WRITER_ERROR_INIT(self,problem,offset) \ + WRITING_ERROR_INIT((self)->error,YAML_WRITER_ERROR,problem,offset) -#define EMITTER_ERROR_INIT(error,context,problem) \ - DUMPING_ERROR_INIT(error,YAML_EMITTER_ERROR,problem) +#define EMITTER_ERROR_INIT(self,context,problem) \ + DUMPING_ERROR_INIT((self)->error,YAML_EMITTER_ERROR,problem) -#define SERIALIZER_ERROR_INIT(error,context) \ - DUMPING_ERROR_INIT(error,YAML_SERIALIZER_ERROR,problem) +#define SERIALIZER_ERROR_INIT(self,context) \ + DUMPING_ERROR_INIT((self)->error,YAML_SERIALIZER_ERROR,problem) /* * The size of the input raw buffer. |