more specctra dsn work

pcbnew/dsn.cpp

@@ -71,6 +71,7 @@ const static KEYWORD tokens[] = {
     TOKDEF(attach),
     TOKDEF(attr),
     TOKDEF(average_pair_length),
+    TOKDEF(back),
     TOKDEF(base_design),
     TOKDEF(bbv_ctr2ctr),
     TOKDEF(bond),
@@ -102,8 +103,8 @@ const static KEYWORD tokens[] = {
     TOKDEF(comment),
     TOKDEF(comp),
     TOKDEF(comp_edge_center),
-    TOKDEF(component),
     TOKDEF(comp_order),
+    TOKDEF(component),
     TOKDEF(composite),
     TOKDEF(conductance_resolution),
     TOKDEF(conductor),
@@ -119,8 +120,9 @@ const static KEYWORD tokens[] = {
     TOKDEF(cross),
     TOKDEF(crosstalk_model),
     TOKDEF(current_resolution),
-    TOKDEF(deleted_keepout),
     TOKDEF(delete_pins),
+    TOKDEF(deleted),
+    TOKDEF(deleted_keepout),
     TOKDEF(delta),
     TOKDEF(diagonal),
     TOKDEF(direction),
@@ -148,6 +150,7 @@ const static KEYWORD tokens[] = {
     TOKDEF(front),
     TOKDEF(front_only),
     TOKDEF(gap),
+    TOKDEF(gate),
     TOKDEF(gates),
     TOKDEF(global),
     TOKDEF(grid),
@@ -364,7 +367,9 @@ const static KEYWORD tokens[] = {
     TOKDEF(string_quote),
     TOKDEF(structure),
     TOKDEF(structure_out),
+    TOKDEF(subgate),
     TOKDEF(subgates),
+    TOKDEF(substituted),
     TOKDEF(such),
     TOKDEF(suffix),
     TOKDEF(super_placement),
@@ -535,29 +540,32 @@ const char* LEXER::GetTokenText( DSN_T aTok )
     {
         switch( aTok )
         {
+        case T_NONE:
+            ret = "NONE";
+            break;
         case T_QUOTE_DEF:
-            ret = "'quoted text delimiter'";
+            ret = "quoted text delimiter";
             break;
         case T_DASH:
-            ret = "'-'";
+            ret = "-";
             break;
         case T_SYMBOL:
-            ret = "'symbol'";
+            ret = "symbol";
             break;
         case T_NUMBER:
-            ret = "'number'";
+            ret = "number";
             break;
         case T_RIGHT:
-            ret = "')'";
+            ret = ")";
             break;
         case T_LEFT:
-            ret = "'('";
+            ret = "(";
             break;
         case T_STRING:
-            ret = "'quoted string'";
+            ret = "quoted string";
             break;
         case T_EOF:
-            ret = "'end of file'";
+            ret = "end of file";
             break;
         default:
             ret = "???";

pcbnew/dsn.h

@@ -70,6 +70,7 @@ enum DSN_T {
     T_attach,
     T_attr,
     T_average_pair_length,
+    T_back,
     T_base_design,
     T_bbv_ctr2ctr,
     T_bond,
@@ -101,8 +102,8 @@ enum DSN_T {
     T_comment,
     T_comp,
     T_comp_edge_center,
-    T_component,
     T_comp_order,
+    T_component,
     T_composite,
     T_conductance_resolution,
     T_conductor,
@@ -118,8 +119,9 @@ enum DSN_T {
     T_cross,
     T_crosstalk_model,
     T_current_resolution,
-    T_deleted_keepout,
     T_delete_pins,
+    T_deleted,
+    T_deleted_keepout,
     T_delta,
     T_diagonal,
     T_direction,
@@ -147,6 +149,7 @@ enum DSN_T {
     T_front,
     T_front_only,
     T_gap,
+    T_gate,
     T_gates,
     T_global,
     T_grid,
@@ -363,7 +366,9 @@ enum DSN_T {
     T_string_quote,
     T_structure,
     T_structure_out,
+    T_subgate,
     T_subgates,
+    T_substituted,
     T_such,
     T_suffix,
     T_super_placement,