38331-convert.sh: create two directories, one for each version of ASN.1 with comments.

[3GPP.git] / awk / txt2asn-integrated.awk

diff --git a/awk/txt2asn-integrated.awk b/awk/txt2asn-integrated.awk
index 407715431fca2c5fd90eee092ccbd24834ca40f2..0f260bff82db18245d6dd3f571515afcf71a1c42 100755 (executable)
--- a/awk/txt2asn-integrated.awk
+++ b/awk/txt2asn-integrated.awk
@@ -44,7 +44,10 @@ function asn1_print()
            print "";
 
            if (field_description_len[structure[line]][field[line]] > 0) {
-               for (i=1;i<=field_description_len[structure[line]][field[line]]; i++) {
+
+               print indentation "-- " field[line] " : " field_description[structure[line]][field[line]][1];
+
+               for (i=2;i<=field_description_len[structure[line]][field[line]]; i++) {
                    
                    print indentation "-- " field_description[structure[line]][field[line]][i];
                    
@@ -54,7 +57,10 @@ function asn1_print()
            if (condition_description_len[condition[line]] > 0) {
                if(field[line] != "")
                {
-                   for(i=1;i<=condition_description_len[condition[line]];i++) {
+                   gsub(/(, )*[Nn]eed [MNSR],*/, "", condition_description[condition[line]][1]);
+                   print indentation "-- " field[line] " : " condition_description[condition[line]][1]; 
+                   
+                   for(i=2;i<=condition_description_len[condition[line]];i++) {
                        gsub(/(, )*[Nn]eed [MNSR],*/, "", condition_description[condition[line]][i]);
                        print indentation "--" condition_description[condition[line]][i]; 
                    }
@@ -126,22 +132,32 @@ BEGIN {
     separator = "" ;
 
     wide_separator = "" ;
-    for(i=0;i<=140;i++) {
+    for(i=0;i<=70;i++) {
        wide_separator = wide_separator "-" ;
     }
 
     ie_separator = "-- " ;
-    for (i=0;i<=137;i++) {
+    for (i=0;i<=70;i++) {
        ie_separator = ie_separator "=" ;
     }
 
 }
 
-/^[0-9]+\./ {
+/^[0-9]+(\.[0-9]+)*\t/ {
     if (in_IE == "yes") {  asn1_print(); }
     in_IE = "no" ;
 }
 
+/^[A-Za-z0-9-]+ message$/ {
+    # No need to print this
+    next;
+}
+
+/^[A-Za-z0-9-]+ information element$/ {
+    # No need to print this
+    next;
+}
+
 /^-- ASN1START/ {
     print "";
     in_ASN1 = "yes";
@@ -152,6 +168,7 @@ BEGIN {
 
 /^-- ASN1STOP/ {
     in_ASN1 = "no";
+    direct_print = "no" ;
     next;
 }
 
@@ -168,7 +185,9 @@ BEGIN {
         #print separator ;
      }
      
-     next_line = "" ;
+     if (next_line != "field description") {
+        next_line = "" ;
+     }
 #     #if (empty_line == "yes") {
 #       next;
 #     }
@@ -197,11 +216,11 @@ BEGIN {
     
 }
 
-/^–[[:space:]]+ParentIE-WithEM$/ {
+/^-[[:space:]]+ParentIE-WithEM$/ {
     exit 0 ;
 }
 
-/^–[[:space:]]+[A-Za-z0-9-]+$/ {
+/^-[[:space:]]+[A-Za-z0-9-]+$/ {
     asn1_print();
 
 #    if (empty_line == "yes") {
@@ -220,12 +239,57 @@ BEGIN {
     next ;
 }
 
+/^-[[:space:]]+Multiplicity and type constraints? definitions?$/ {
+
+    #print "Trouvé" ;
+    if (in_IE == "yes") {
+       asn1_print();
+    }
+    in_IE = "yes" ;
+    #print "Trouvé 2" ;
+
+    # In this case, directly print ASN.1 without processing
+    direct_print = "yes" ;
+    
+    print ie_separator;
+    print "-- IE: Constants";
+    print "" ;
+    empty_line = "no" ;
+    conditions = "" ;
+
+    next ;
+}
+
+/^-[[:space:]]+End of [A-Za-z0-9-]+$/ {
+    if (in_IE == "yes") {
+       asn1_print();
+    }
+    in_IE = "yes" ;
+    empty_line = "no" ;
+    conditions = "" ;
+}
+
+/^NR-InterNodeDefinitions/ {
+    
+    print ie_separator;
+    print "-- IE: NR-InterNodeDefinitions";
+    print "" ;
+    print ;
+    
+    empty_line = "no" ;
+    conditions = "" ;
+
+    in_IE = "no" ;
+    direct_print = "yes" ;
+    next ;
+}
+
 /^Conditional [Pp]resence/ {
     add_line_after = "";
     separator = "" ;
 
     $0 = "Conditional presence" ;
-    for(i=0;i<=140;i++) {
+    for(i=0;i<=70;i++) {
        separator = separator "-" ;
     }
 #    print separator;
@@ -241,7 +305,7 @@ BEGIN {
     add_line_after = "";
     separator = "" ;
 
-    for(i=0;i<=140;i++) {
+    for(i=0;i<=70;i++) {
        separator = separator "-" ;
     }
 #    print separator;
@@ -263,7 +327,7 @@ BEGIN {
 #}
 
 # This is matched for any non-empty line
-/^[A-Za-z0-9-]+/ {
+/[A-Za-z0-9-]+/ {
 
     
     if ((in_IE == "yes") && (in_ASN1 == "no")){
@@ -338,6 +402,11 @@ BEGIN {
            }
        }   
     }
+
+    else if ((in_ASN1 == "yes") && (direct_print == "yes")) {
+       print ;
+       next ;
+    }
 }
 
 #/^[A-Za-z0-9-]+/ {
@@ -406,7 +475,11 @@ BEGIN {
                if((line_number==0) && (/^[[:space:]]*$/)) { next ; }
                line_number++;
                text[line_number] = $0;
-               
+
+               if (/Multiplicity/) {
+                   print "Trouvé 3";
+                   print $0;
+               }
                #print "text[" line_number "] est " text[line_number];
                if (/^[A-Za-z0-9-]+[[:space:]]+:/) {
                    # remove suffix
@@ -482,6 +555,9 @@ BEGIN {
        if (/-- Cond [A-Za-z0-9_-]+$/) {
            conditions = conditions " " $NF ;
        }
-    }  
+    }
+    else if ((in_ASN1 == "yes") && (direct_print == "yes")) {
+       print ;
+    }
 }