Generate a more readable header file.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1845 ec53bebd-3082-4978-b11e-865c3cabbd6b

lib/asn1/gen.c

@@ -21,6 +21,9 @@ init_generate (char *filename)
 	     "/* Generated from %s */\n"
 	     "/* Do not edit */\n\n",
 	     filename);
+    fprintf (headerfile, 
+	     "#ifndef __" STEM "_h__\n"
+	     "#define __" STEM "_h__\n\n");
     logfile = fopen(STEM "_files", "w");
     if (logfile == NULL) {
 	fprintf (stderr, "Could not open " STEM "_files" "\n");
@@ -31,9 +34,11 @@ init_generate (char *filename)
 void
 close_generate ()
 {
-  fclose (headerfile);
+    fprintf (headerfile, "#endif /* __" STEM "_h__ /*\n");
-  fprintf (logfile, "\n");
+
-  fclose (logfile);
+    fclose (headerfile);
+    fprintf (logfile, "\n");
+    fclose (logfile);
 }
 
 void
@@ -44,90 +49,197 @@ generate_constant (Symbol *s)
 }
 
 static void
-define_type (char *name, Type *t)
+space(int level)
 {
-  switch (t->type) {
+    while(level-- > 0)
-  case TType:
+	fprintf(headerfile, "  ");
-    fprintf (headerfile, "%s %s;\n", t->symbol->gen_name, name);
+}
-    break;
-  case TInteger:
-    fprintf (headerfile, "unsigned %s;\n", name);
-    break;
-  case TOctetString:
-    fprintf (headerfile, "krb5_data %s;\n", name);
-    break;
-  case TBitString: {
-    Member *m;
-    Type i;
-    int tag = -1;
 
-    i.type = TInteger;
+static void
-    fprintf (headerfile, "struct {\n");
+define_asn1 (int level, Type *t)
-    for (m = t->members; m && m->val != tag; m = m->next) {
+{
-      char *n = malloc(strlen(m->gen_name) + 3);
+    switch (t->type) {
-      strcpy (n, m->gen_name);
+    case TType:
-      strcat (n, ":1");
+	space(level);
-      define_type (n, &i);
+	fprintf (headerfile, "%s", t->symbol->name);
-      free (n);
+	break;
-      if (tag == -1)
+    case TInteger:
-	tag = m->val;
+	space(level);
+	fprintf (headerfile, "INTEGER");
+	break;
+    case TOctetString:
+	space(level);
+	fprintf (headerfile, "OCTET STRING");
+	break;
+    case TBitString: {
+	Member *m;
+	Type i;
+	int tag = -1;
+
+	i.type = TInteger;
+	space(level);
+	fprintf (headerfile, "BIT STRING {\n");
+	for (m = t->members; m && m->val != tag; m = m->next) {
+	    if (tag == -1)
+		tag = m->val;
+	    space(level + 1);
+	    fprintf (headerfile, "%s(%d)%s\n", m->name, m->val, 
+		     m->next->val == tag?"":",");
+
+	}
+	space(level);
+	fprintf (headerfile, "}");
+	break;
     }
-    fprintf (headerfile, "} %s;\n\n", name);
+    case TSequence: {
-    break;
+	Member *m;
-  }
+	int tag = -1;
-  case TSequence: {
-    Member *m;
-    int tag = -1;
 
-    fprintf (headerfile, "struct {\n");
+	space(level);
-    for (m = t->members; m && m->val != tag; m = m->next) {
+	fprintf (headerfile, "SEQUENCE {\n");
-      if (m->optional) {
+	for (m = t->members; m && m->val != tag; m = m->next) {
-	char *n = malloc(strlen(m->gen_name) + 2);
+	    if (tag == -1)
-
+		tag = m->val;
-	*n = '*';
+	    space(level + 1);
-	strcpy (n+1, m->gen_name);
+	    fprintf (headerfile, "%s[%d] ", m->name, m->val);
-	define_type (n, m->type);
+	    if(strlen(m->name) < 16)
-	free (n);
+		fprintf (headerfile, "%*s", 16 - strlen(m->name), "");
-      } else
+	    define_asn1(level + 1, m->type);
-	define_type (m->gen_name, m->type);
+	    if(m->optional)
-      if (tag == -1)
+		fprintf(headerfile, " OPTIONAL");
-	tag = m->val;
+	    if(m->next->val != tag)
+		fprintf (headerfile, ",");
+	    fprintf (headerfile, "\n");
+	}
+	space(level);
+	fprintf (headerfile, "}");
+	break;
     }
-    fprintf (headerfile, "} %s;\n\n", name);
+    case TSequenceOf: {
-    break;
+	space(level);
-  }
+	fprintf (headerfile, "SEQUENCE OF ");
-  case TSequenceOf: {
+	define_asn1 (0, t->subtype);
-    Type i;
+	break;
+    }
+    case TGeneralizedTime:
+	space(level);
+	fprintf (headerfile, "GeneralizedTime");
+	break;
+    case TGeneralString:
+	space(level);
+	fprintf (headerfile, "GeneralString");
+	break;
+    case TApplication:
+	fprintf (headerfile, "[APPLICATION %d] ", t->application);
+	define_asn1 (level, t->subtype);
+	break;
+    default:
+	abort ();
+    }
+}
 
-    i.type = TInteger;
+static void
-    i.application = 0;
+define_type (int level, char *name, Type *t)
+{
+    switch (t->type) {
+    case TType:
+	space(level);
+	fprintf (headerfile, "%s %s;\n", t->symbol->gen_name, name);
+	break;
+    case TInteger:
+	space(level);
+	fprintf (headerfile, "unsigned %s;\n", name);
+	break;
+    case TOctetString:
+	space(level);
+	fprintf (headerfile, "krb5_data %s;\n", name);
+	break;
+    case TBitString: {
+	Member *m;
+	Type i;
+	int tag = -1;
 
-    fprintf (headerfile, "struct {\n");
+	i.type = TInteger;
-    define_type ("len", &i);
+	space(level);
-    define_type ("*val", t->subtype);
+	fprintf (headerfile, "struct {\n");
-    fprintf (headerfile, "} %s;\n\n", name);
+	for (m = t->members; m && m->val != tag; m = m->next) {
-    break;
+	    char *n = malloc(strlen(m->gen_name) + 3);
-  }
+	    strcpy (n, m->gen_name);
-  case TGeneralizedTime:
+	    strcat (n, ":1");
-    fprintf (headerfile, "time_t %s;\n", name);
+	    define_type (level + 1, n, &i);
-    break;
+	    free (n);
-  case TGeneralString:
+	    if (tag == -1)
-    fprintf (headerfile, "char *%s;\n", name);
+		tag = m->val;
-    break;
+	}
-  case TApplication:
+	space(level);
-    define_type (name, t->subtype);
+	fprintf (headerfile, "} %s;\n\n", name);
-    break;
+	break;
-  default:
+    }
-    abort ();
+    case TSequence: {
-  }
+	Member *m;
+	int tag = -1;
+
+	space(level);
+	fprintf (headerfile, "struct {\n");
+	for (m = t->members; m && m->val != tag; m = m->next) {
+	    if (m->optional) {
+		char *n = malloc(strlen(m->gen_name) + 2);
+
+		*n = '*';
+		strcpy (n+1, m->gen_name);
+		define_type (level + 1, n, m->type);
+		free (n);
+	    } else
+		define_type (level + 1, m->gen_name, m->type);
+	    if (tag == -1)
+		tag = m->val;
+	}
+	space(level);
+	fprintf (headerfile, "} %s;\n", name);
+	break;
+    }
+    case TSequenceOf: {
+	Type i;
+
+	i.type = TInteger;
+	i.application = 0;
+
+	space(level);
+	fprintf (headerfile, "struct {\n");
+	define_type (level + 1, "len", &i);
+	define_type (level + 1, "*val", t->subtype);
+	space(level);
+	fprintf (headerfile, "} %s;\n", name);
+	break;
+    }
+    case TGeneralizedTime:
+	space(level);
+	fprintf (headerfile, "time_t %s;\n", name);
+	break;
+    case TGeneralString:
+	space(level);
+	fprintf (headerfile, "char *%s;\n", name);
+	break;
+    case TApplication:
+	define_type (level, name, t->subtype);
+	break;
+    default:
+	abort ();
+    }
 }
 
 static void
 generate_type_header (Symbol *s)
 {
-  fprintf (headerfile, "typedef ");
+    fprintf (headerfile, "/*\n");
-  define_type (s->gen_name, s->type);
+    fprintf (headerfile, "%s ::= ", s->name);
-  fprintf (headerfile, "\n");
+    define_asn1 (0, s->type);
+    fprintf (headerfile, "\n*/\n\n");
+
+    fprintf (headerfile, "typedef ");
+    define_type (0, s->gen_name, s->type);
+
+    fprintf (headerfile, "\n");
 }
 
 
@@ -158,6 +270,7 @@ generate_type (Symbol *s)
     generate_type_free (s);
     generate_type_length (s);
     generate_type_copy (s);
+    generate_type_maybe (s);
     fprintf(headerfile, "\n\n");
     fclose(codefile);
 }