Remove externally available parser

danielcode · danielcode · commit 2fc36a485d3b · 2014-02-15T22:39:17.000-05:00
diff --git a/src/asn1/Makefile b/src/asn1/Makefile
@@ -29,8 +29,8 @@ OBJS 	= ASNBinaryExpression.o ASNBinaryOperator.o ASNColumnRef.o ASNColumnRefIte
 		  NativeEnumerated.o NativeInteger.o NativeReal.o OCTET_STRING.o REAL.o UTF8String.o asn_SEQUENCE_OF.o \
 		  asn_SET_OF.o asn_codecs_prim.o ber_decoder.o ber_tlv_length.o ber_tlv_tag.o constr_CHOICE.o \
 		  constr_SEQUENCE.o constr_SEQUENCE_OF.o constr_SET_OF.o constr_TYPE.o constraints.o der_encoder.o \
-		  per_decoder.o per_encoder.o per_support.o xer_decoder.o xer_encoder.o xer_support.o pg-asn1-encode.o \
-		  tree_to_asn1.o
+		  per_decoder.o per_encoder.o per_support.o per_opentype.o xer_decoder.o xer_encoder.o xer_support.o \
+		  pg-asn1-encode.o tree_to_asn1.o
 
 GENH= generated/ASNBinaryExpression.h generated/ASNBinaryOperator.h generated/ASNColumnRef.h \
 	generated/ASNColumnRefItem.h generated/ASNColumnRefList.h generated/ASNExpression.h generated/ASNFromClause.h \
@@ -43,7 +43,8 @@ GENH= generated/ASNBinaryExpression.h generated/ASNBinaryOperator.h generated/AS
 	generated/ber_tlv_length.h generated/ber_tlv_tag.h generated/constr_CHOICE.h generated/constr_SEQUENCE.h \
 	generated/constr_SEQUENCE_OF.h generated/constr_SET_OF.h generated/constr_TYPE.h generated/constraints.h \
 	generated/der_encoder.h generated/per_decoder.h generated/per_encoder.h generated/per_support.h \
-	generated/xer_decoder.h generated/xer_encoder.h generated/xer_support.h generated/expr_types.h
+	generated/per_opentype.h generated/xer_decoder.h generated/xer_encoder.h generated/xer_support.h \
+	generated/expr_types.h
 
 HEADERS= pg-asn1-encode.h
 
@@ -57,8 +58,8 @@ GENC =	generated/ASNBinaryExpression.c generated/ASNBinaryOperator.c generated/A
 		generated/ber_decoder.c generated/ber_tlv_length.c generated/ber_tlv_tag.c generated/constr_CHOICE.c \
 		generated/constr_SEQUENCE.c generated/constr_SEQUENCE_OF.c generated/constr_SET_OF.c generated/constr_TYPE.c \
 		generated/constraints.c generated/der_encoder.c generated/per_decoder.c generated/per_encoder.c \
-		generated/per_support.c generated/xer_decoder.c generated/xer_encoder.c generated/xer_support.c \
-		generated/expr_types.h
+		generated/per_support.c generated/per_opentype.c generated/xer_decoder.c generated/xer_encoder.c \
+		generated/xer_support.c generated/expr_types.h
 
 SOURCES= pg-asn1-encode.c tree_to_asn1.c
 
diff --git a/src/asn1/generated/ASNBinaryExpression.c b/src/asn1/generated/ASNBinaryExpression.c
@@ -85,6 +85,7 @@ asn_TYPE_descriptor_t asn_DEF_ASNBinaryExpression = {
 	0,	/* Not an Anonymous Type */
 	sizeof(ASNBinaryExpression_t),
 	1,	/* Generated */
-	"asn_DEF_ASNBinaryExpression" /* Symbol String */
+	"asn_DEF_ASNBinaryExpression", /* Symbol String */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL
 };
 
diff --git a/src/asn1/generated/ASNBinaryOperator.c b/src/asn1/generated/ASNBinaryOperator.c
@@ -164,6 +164,7 @@ asn_TYPE_descriptor_t asn_DEF_ASNBinaryOperator = {
 	0,	/* Not an Anonymous Type */
 	sizeof(ASNBinaryOperator_t),
 	1,	/* Generated */
-	"asn_DEF_ASNBinaryOperator" /* Symbol String */
+	"asn_DEF_ASNBinaryOperator", /* Symbol String */
+	&ASNBinaryOperator_1_inherit_TYPE_descriptor
 };
 
diff --git a/src/asn1/generated/ASNColumnRef.c b/src/asn1/generated/ASNColumnRef.c
@@ -59,6 +59,7 @@ asn_TYPE_descriptor_t asn_DEF_ASNColumnRef = {
 	0,	/* Not an Anonymous Type */
 	sizeof(ASNColumnRef_t),
 	1,	/* Generated */
-	"asn_DEF_ASNColumnRef" /* Symbol String */
+	"asn_DEF_ASNColumnRef", /* Symbol String */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL
 };
 
diff --git a/src/asn1/generated/ASNColumnRefItem.c b/src/asn1/generated/ASNColumnRefItem.c
@@ -70,6 +70,7 @@ asn_TYPE_descriptor_t asn_DEF_ASNColumnRefItem = {
 	0,	/* Not an Anonymous Type */
 	sizeof(ASNColumnRefItem_t),
 	1,	/* Generated */
-	"asn_DEF_ASNColumnRefItem" /* Symbol String */
+	"asn_DEF_ASNColumnRefItem", /* Symbol String */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL
 };
 
diff --git a/src/asn1/generated/ASNColumnRefList.c b/src/asn1/generated/ASNColumnRefList.c
@@ -52,6 +52,7 @@ asn_TYPE_descriptor_t asn_DEF_ASNColumnRefList = {
 	0,	/* Not an Anonymous Type */
 	sizeof(ASNColumnRefList_t),
 	1,	/* Generated */
-	"asn_DEF_ASNColumnRefList" /* Symbol String */
+	"asn_DEF_ASNColumnRefList", /* Symbol String */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL
 };
 
diff --git a/src/asn1/generated/ASNExpression.c b/src/asn1/generated/ASNExpression.c
@@ -90,6 +90,7 @@ asn_TYPE_descriptor_t asn_DEF_ASNExpression = {
 	0,	/* Not an Anonymous Type */
 	sizeof(ASNExpression_t),
 	1,	/* Generated */
-	"asn_DEF_ASNExpression" /* Symbol String */
+	"asn_DEF_ASNExpression", /* Symbol String */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL
 };
 
diff --git a/src/asn1/generated/ASNFromClause.c b/src/asn1/generated/ASNFromClause.c
@@ -52,6 +52,7 @@ asn_TYPE_descriptor_t asn_DEF_ASNFromClause = {
 	0,	/* Not an Anonymous Type */
 	sizeof(ASNFromClause_t),
 	1,	/* Generated */
-	"asn_DEF_ASNFromClause" /* Symbol String */
+	"asn_DEF_ASNFromClause", /* Symbol String */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL
 };
 
diff --git a/src/asn1/generated/ASNPlusExpression.c b/src/asn1/generated/ASNPlusExpression.c
@@ -75,6 +75,7 @@ asn_TYPE_descriptor_t asn_DEF_ASNPlusExpression = {
 	0,	/* Not an Anonymous Type */
 	sizeof(ASNPlusExpression_t),
 	1,	/* Generated */
-	"asn_DEF_ASNPlusExpression" /* Symbol String */
+	"asn_DEF_ASNPlusExpression", /* Symbol String */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL
 };
 
diff --git a/src/asn1/generated/ASNQuery.c b/src/asn1/generated/ASNQuery.c
@@ -52,6 +52,7 @@ asn_TYPE_descriptor_t asn_DEF_ASNQuery = {
 	0,	/* Not an Anonymous Type */
 	sizeof(ASNQuery_t),
 	1,	/* Generated */
-	"asn_DEF_ASNQuery" /* Symbol String */
+	"asn_DEF_ASNQuery", /* Symbol String */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL
 };
 
diff --git a/src/asn1/generated/ASNRangeVar.c b/src/asn1/generated/ASNRangeVar.c
@@ -81,6 +81,7 @@ asn_TYPE_descriptor_t asn_DEF_ASNRangeVar = {
 	0,	/* Not an Anonymous Type */
 	sizeof(ASNRangeVar_t),
 	1,	/* Generated */
-	"asn_DEF_ASNRangeVar" /* Symbol String */
+	"asn_DEF_ASNRangeVar", /* Symbol String */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL
 };
 
diff --git a/src/asn1/generated/ASNResTarget.c b/src/asn1/generated/ASNResTarget.c
@@ -80,6 +80,7 @@ asn_TYPE_descriptor_t asn_DEF_ASNResTarget = {
 	0,	/* Not an Anonymous Type */
 	sizeof(ASNResTarget_t),
 	1,	/* Generated */
-	"asn_DEF_ASNResTarget" /* Symbol String */
+	"asn_DEF_ASNResTarget", /* Symbol String */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL
 };
 
diff --git a/src/asn1/generated/ASNResTargetExpression.c b/src/asn1/generated/ASNResTargetExpression.c
@@ -75,6 +75,7 @@ asn_TYPE_descriptor_t asn_DEF_ASNResTargetExpression = {
 	0,	/* Not an Anonymous Type */
 	sizeof(ASNResTargetExpression_t),
 	1,	/* Generated */
-	"asn_DEF_ASNResTargetExpression" /* Symbol String */
+	"asn_DEF_ASNResTargetExpression", /* Symbol String */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL
 };
 
diff --git a/src/asn1/generated/ASNSelectStmt.c b/src/asn1/generated/ASNSelectStmt.c
@@ -53,7 +53,8 @@ asn_TYPE_descriptor_t asn_DEF_targets_2 = {
 	0,	/* Not an Anonymous Type */
 	sizeof(struct targets),
 	1,	/* Generated */
-	"asn_DEF_targets" /* Symbol String */
+	"asn_DEF_targets", /* Symbol String */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL
 };
 
 static asn_TYPE_member_t asn_MBR_fromClause_4[] = {
@@ -103,7 +104,8 @@ asn_TYPE_descriptor_t asn_DEF_fromClause_4 = {
 	0,	/* Not an Anonymous Type */
 	sizeof(struct fromClause),
 	1,	/* Generated */
-	"asn_DEF_fromClause" /* Symbol String */
+	"asn_DEF_fromClause", /* Symbol String */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL
 };
 
 static asn_TYPE_member_t asn_MBR_ASNSelectStmt_1[] = {
@@ -171,6 +173,7 @@ asn_TYPE_descriptor_t asn_DEF_ASNSelectStmt = {
 	0,	/* Not an Anonymous Type */
 	sizeof(ASNSelectStmt_t),
 	1,	/* Generated */
-	"asn_DEF_ASNSelectStmt" /* Symbol String */
+	"asn_DEF_ASNSelectStmt", /* Symbol String */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL
 };
 
diff --git a/src/asn1/generated/ASNString.c b/src/asn1/generated/ASNString.c
@@ -70,6 +70,7 @@ asn_TYPE_descriptor_t asn_DEF_ASNString = {
 	0,	/* Not an Anonymous Type */
 	sizeof(ASNString_t),
 	1,	/* Generated */
-	"asn_DEF_ASNString" /* Symbol String */
+	"asn_DEF_ASNString", /* Symbol String */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL
 };
 
diff --git a/src/asn1/generated/BIT_STRING.c b/src/asn1/generated/BIT_STRING.c
@@ -43,7 +43,8 @@ asn_TYPE_descriptor_t asn_DEF_BIT_STRING = {
 	0, /* Not Anonymous */
 	sizeof(BIT_STRING_t),
 	0,	/* Not generated */
-	"asn_DEF_BIT_STRING" /* Symbol string */
+	"asn_DEF_BIT_STRING", /* Symbol string */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL /* Not inherited */
 };
 
 /*
diff --git a/src/asn1/generated/BOOLEAN.c b/src/asn1/generated/BOOLEAN.c
@@ -36,7 +36,8 @@ asn_TYPE_descriptor_t asn_DEF_BOOLEAN = {
 	0, /* Not Anonymous */
 	sizeof(BOOLEAN_t),
 	0, /* Not generated */
-	"asn_DEF_BOOLEAN" /* Symbol string */
+	"asn_DEF_BOOLEAN", /* Symbol string */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL /* Not inherited */
 };
 
 /*
diff --git a/src/asn1/generated/IA5String.c b/src/asn1/generated/IA5String.c
@@ -43,7 +43,8 @@ asn_TYPE_descriptor_t asn_DEF_IA5String = {
 	0, /* Not Anonymous */
 	sizeof(IA5String_t),
 	0, /* Not generated */
-	"asn_DEF_IA5String" /* Symbol string */
+	"asn_DEF_IA5String", /* Symbol string */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL /* Not inherited */
 };
 
 int
diff --git a/src/asn1/generated/INTEGER.c b/src/asn1/generated/INTEGER.c
@@ -43,7 +43,8 @@ asn_TYPE_descriptor_t asn_DEF_INTEGER = {
 	0, /* Not Anonymous */
 	sizeof(INTEGER_t),
 	0, /* Not generated */
-	"asn_DEF_INTEGER" /* Symbol string */
+	"asn_DEF_INTEGER", /* Symbol string */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL /* Not inherited */
 };
 
 /*
diff --git a/src/asn1/generated/NULL.c b/src/asn1/generated/NULL.c
@@ -37,7 +37,8 @@ asn_TYPE_descriptor_t asn_DEF_NULL = {
 	0, /* Not Anonymous */
 	sizeof(NULL_t),
 	0, /* Not generated */
-	"asn_DEF_NULL" /* Symbol string */
+	"asn_DEF_NULL", /* Symbol string */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL /* Not inherited */
 };
 
 asn_enc_rval_t
diff --git a/src/asn1/generated/NativeEnumerated.c b/src/asn1/generated/NativeEnumerated.c
@@ -42,7 +42,8 @@ asn_TYPE_descriptor_t asn_DEF_NativeEnumerated = {
 	0, /* Not Anonymous */
 	sizeof(INTEGER_t),
 	0, /* Not generated */
-	"asn_DEF_NativeEnumerated" /* Symbol string */
+	"asn_DEF_NativeEnumerated", /* Symbol string */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL /* Not inherited */
 };
 
 asn_enc_rval_t
diff --git a/src/asn1/generated/NativeInteger.c b/src/asn1/generated/NativeInteger.c
@@ -43,7 +43,8 @@ asn_TYPE_descriptor_t asn_DEF_NativeInteger = {
 	0, /* Not Anonymous */
 	sizeof(INTEGER_t),
 	0, /* Not generated */
-	"asn_DEF_NativeInteger" /* Symbol string */
+	"asn_DEF_NativeInteger", /* Symbol string */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL /* Not inherited */
 };
 
 /*
diff --git a/src/asn1/generated/NativeReal.c b/src/asn1/generated/NativeReal.c
@@ -44,7 +44,8 @@ asn_TYPE_descriptor_t asn_DEF_NativeReal = {
 	0, /* Not Anonymous */
 	sizeof(REAL_t),
 	0, /* Not generated */
-	"asn_DEF_NativeReal" /* Symbol string */
+	"asn_DEF_NativeReal", /* Symbol string */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL /* Not inherited */
 };
 
 /*
diff --git a/src/asn1/generated/OCTET_STRING.c b/src/asn1/generated/OCTET_STRING.c
@@ -50,7 +50,8 @@ asn_TYPE_descriptor_t asn_DEF_OCTET_STRING = {
 	0, /* Not Anonymous */
 	sizeof(OCTET_STRING_t),
 	0, /* Not generated */
-	"asn_DEF_OCTET_STRING" /* Symbol string */
+	"asn_DEF_OCTET_STRING", /* Symbol string */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL /* Not inherited */
 };
 
 #undef	_CH_PHASE
diff --git a/src/asn1/generated/REAL.c b/src/asn1/generated/REAL.c
@@ -57,7 +57,8 @@ asn_TYPE_descriptor_t asn_DEF_REAL = {
 	0, /* Not Anonymous */
 	sizeof(REAL_t),
 	0, /* Not generated */
-	"asn_DEF_REAL" /* Symbol string */
+	"asn_DEF_REAL", /* Symbol string */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL /* Not inherited */
 };
 
 typedef enum specialRealValue {
diff --git a/src/asn1/generated/UTF8String.c b/src/asn1/generated/UTF8String.c
@@ -39,7 +39,8 @@ asn_TYPE_descriptor_t asn_DEF_UTF8String = {
 	0, /* Not Anonymous */
 	sizeof(UTF8String_t),
 	0, /* Not generated */
-	"asn_DEF_UTF8String" /* Symbol string */
+	"asn_DEF_UTF8String", /* Symbol string */
+	(void (*)(struct asn_TYPE_descriptor_s *))NULL /* Not inherited */
 };
 
 /*
diff --git a/src/asn1/generated/constr_TYPE.h b/src/asn1/generated/constr_TYPE.h
@@ -153,6 +153,11 @@ typedef struct asn_TYPE_descriptor_s {
 	 * Name of the symbol representing the type.
 	 */
 	char *symbol;
+
+	/*
+	 * A function to handle inheritance
+	 */
+	void (*inherit)(struct asn_TYPE_descriptor_s *td);
 } asn_TYPE_descriptor_t;
 
 /*
diff --git a/src/include/asn1/constr_TYPE.h b/src/include/asn1/constr_TYPE.h
@@ -153,6 +153,11 @@ typedef struct asn_TYPE_descriptor_s {
 	 * Name of the symbol representing the type.
 	 */
 	char *symbol;
+
+	/*
+	 * A function to handle inheritance
+	 */
+	void (*inherit)(struct asn_TYPE_descriptor_s *td);
 } asn_TYPE_descriptor_t;
 
 /*
diff --git a/src/include/asn1/per_opentype.h b/src/include/asn1/per_opentype.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2007 Lev Walkin <vlm@lionet.info>. All rights reserved.
+ * Redistribution and modifications are permitted subject to BSD license.
+ */
+#ifndef	_PER_OPENTYPE_H_
+#define	_PER_OPENTYPE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+asn_dec_rval_t uper_open_type_get(asn_codec_ctx_t *opt_codec_ctx, asn_TYPE_descriptor_t *td, asn_per_constraints_t *constraints, void **sptr, asn_per_data_t *pd);
+
+int uper_open_type_skip(asn_codec_ctx_t *opt_codec_ctx, asn_per_data_t *pd);
+
+int uper_open_type_put(asn_TYPE_descriptor_t *td, asn_per_constraints_t *constraints, void *sptr, asn_per_outp_t *po);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif	/* _PER_OPENTYPE_H_ */
diff --git a/src/include/asn1/pg-asn1-encode.h b/src/include/asn1/pg-asn1-encode.h
@@ -19,10 +19,4 @@ typedef struct bufferInfo
 	int		 length;
 } bufferInfo_t;
 
-typedef struct transferBuffer
-{
-	ASNQuery_t	*queryStmt;
-	bufferInfo_t bufferInfo;
-} transferBuffer_t;
-
 #endif
diff --git a/src/interfaces/libpqasn1/fe-exec-asn1.c b/src/interfaces/libpqasn1/fe-exec-asn1.c
