Changeset 5345 for developers/werner/fped/fpd.y

Timestamp:

07/31/09 03:33:56 (4 years ago)

Author:

werner

Message:

• name of anonymous vectors wasn't initialized
• made active vectors a little brighter to better tell them apart from inactive ones
• frames are now (again) ordered from root down
• added new item .circ to avoid crazy .arc syntax

File:

• developers/werner/fped/fpd.y (modified) (6 diffs)

developers/werner/fped/fpd.y

@@ -22 +22 @@
 
 static struct frame *curr_frame;
-static struct frame **next_frame;
+static struct frame *last_frame = NULL;
 static struct table **next_table;
 static struct loop **next_loop;
@@ -123 +123 @@
 
 
-%token          TOK_FRAME TOK_TABLE TOK_VEC TOK_PAD TOK_RECT TOK_LINE TOK_ARC
+%token          TOK_FRAME TOK_TABLE TOK_VEC
+%token          TOK_PAD TOK_RECT TOK_LINE TOK_CIRC TOK_ARC
 
 %token  <num>   NUMBER
@@ -142 +143 @@
 all:
                 {
-                        frames = zalloc_type(struct frame);
-                        next_frame = &frames->next;
-                        set_frame(frames);
+                        root_frame = zalloc_type(struct frame);
+                        set_frame(root_frame);
                 }
         frame_defs frame_items
+                {
+                        root_frame->prev = last_frame;
+                        if (last_frame)
+                                last_frame->next = root_frame;
+                        else
+                                frames = root_frame;
+                }
         ;
 
@@ -158 +165 @@
                         if (find_frame($2))
                                 yyerrorf("duplicate frame \"%s\"", $2);
-                        *next_frame = zalloc_type(struct frame);
-                        (*next_frame)->name = $2;
-                        set_frame(*next_frame);
-                        next_frame = &(*next_frame)->next;
+                        curr_frame = zalloc_type(struct frame);
+                        curr_frame->name = $2;
+                        set_frame(curr_frame);
+                        curr_frame->prev = last_frame;
+                        if (last_frame)
+                                last_frame->next = curr_frame;
+                        else
+                                frames = curr_frame;
+                        last_frame = curr_frame;
 
                 }
             frame_items '}'
                 {
-                        set_frame(frames);
+                        set_frame(root_frame);
                 }
         ;
@@ -302 +314 @@
                 {
                         $$ = alloc_type(struct vec);
+                        $$->name = NULL;
                         $$->base = $2;
                         if ($2)
@@ -354 +367 @@
                         $$->u.line.other = $3;
                 }
-        | TOK_ARC base base opt_base
+        | TOK_CIRC base base
                 {
                         $$ = new_obj(ot_arc);
                         $$->base = $2;
                         $$->u.arc.start = $3;
-                        $$->u.arc.end = $4 ? $4 : $3;
+                        $$->u.arc.end = $3;
+                }
+        | TOK_ARC base base base
+                {
+                        $$ = new_obj(ot_arc);
+                        $$->base = $2;
+                        $$->u.arc.start = $3;
+                        $$->u.arc.end = $4;
                 }
         | TOK_FRAME ID base