Changeset 5397

Timestamp:

08/06/09 23:57:18 (4 years ago)

Author:

werner

Message:

• tables no longer try to fill the available space in the variables area
• added string-valued expressions (on-going)
• loops, tables, and rows can now be deleted/undeleted (still need columns)

Location:

trunk/eda/fped

Files:

• delete.c (modified) (5 diffs)
• expr.c (modified) (1 diff)
• expr.h (modified) (2 diffs)
• fpd.y (modified) (1 diff)
• gui.c (modified) (2 diffs)

trunk/eda/fped/delete.c

@@ -27 +27 @@
                 dt_obj,
                 dt_frame,
+                dt_table,
+                dt_row,
+                dt_column,
+                dt_loop,
         } type;
         union {
@@ -41 +45 @@
                         struct obj *prev;
                 } obj;
+                struct {
+                        struct table *ref;
+                        struct table *prev;
+                } table;
+                struct {
+                        struct row *ref;
+                        struct row *prev;
+                } row;
+                struct {
+                        struct var *var;
+                        struct value *values;
+                        struct table *table;
+                        int n;
+                } col;
+                struct {
+                        struct loop *ref;
+                        struct loop *prev;
+                } loop;
         } u;
         int group;
@@ -226 +248 @@
 }
 
+
+
+/* ----- rows -------------------------------------------------------------- */
+
+
+void delete_row(struct row *row)
+{
+        struct deletion *del;
+        struct row *walk, *prev;
+
+        groups++;
+        prev = NULL;
+        for (walk = row->table->rows; walk != row; walk = walk->next)
+                prev = walk;
+        if (prev)
+                prev->next = row->next;
+        else
+                row->table->rows = row->next;
+        del = new_deletion(dt_row);
+        del->u.row.ref = row;
+        del->u.row.prev = prev;
+}
+
+
+static void undelete_row(struct row *row, struct row *prev)
+{
+        if (prev) {
+                assert(row->next == prev->next);
+                prev->next = row;
+        } else {
+                assert(row->next == row->table->rows);
+                row->table->rows = row;
+        }
+}
+
+
+/* ----- columns ----------------------------------------------------------- */
+
+
+void delete_column(struct table *table, int n)
+{
+        groups++;
+}
+
+
 /* ----- tables ------------------------------------------------------------ */
 
 
-void delete_row(struct row *row)
-{
-}
-
-
-void delete_column(struct table *table, int n)
-{
-}
-
-
 void delete_table(struct table *table)
 {
+        struct frame *frame = table->vars->frame;
+        struct deletion *del;
+        struct table *walk, *prev;
+
+        groups++;
+        prev = NULL;
+        for (walk = frame->tables; walk != table; walk = walk->next)
+                prev = walk;
+        if (prev)
+                prev->next = table->next;
+        else
+                frame->tables = table->next;
+        del = new_deletion(dt_table);
+        del->u.table.ref = table;
+        del->u.table.prev = prev;
+}
+
+
+static void undelete_table(struct table *table, struct table *prev)
+{
+        struct frame *frame = table->vars->frame;
+
+        if (prev) {
+                assert(table->next == prev->next);
+                prev->next = table;
+        } else {
+                assert(table->next == frame->tables);
+                frame->tables = table;
+        }
 }
 
@@ -249 +335 @@
 void delete_loop(struct loop *loop)
 {
+        struct frame *frame = loop->var.frame;
+        struct deletion *del;
+        struct loop *walk, *prev;
+
+        groups++;
+        prev = NULL;
+        for (walk = frame->loops; walk != loop; walk = walk->next)
+                prev = walk;
+        if (prev)
+                prev->next = loop->next;
+        else
+                frame->loops = loop->next;
+        del = new_deletion(dt_loop);
+        del->u.loop.ref = loop;
+        del->u.loop.prev = prev;
+}
+
+
+static void undelete_loop(struct loop *loop, struct loop *prev)
+{
+        struct frame *frame = loop->var.frame;
+
+        if (prev) {
+                assert(loop->next == prev->next);
+                prev->next = loop;
+        } else {
+                assert(loop->next == frame->loops);
+                frame->loops = loop;
+        }
 }
 
@@ -348 +463 @@
                 undelete_frame(del->u.frame.ref, del->u.frame.prev);
                 break;
+        case dt_loop:
+                undelete_loop(del->u.loop.ref, del->u.loop.prev);
+                break;
+        case dt_table:
+                undelete_table(del->u.table.ref, del->u.table.prev);
+                break;
+        case dt_row:
+                undelete_row(del->u.row.ref, del->u.row.prev);
+                break;
         default:
                 abort();

trunk/eda/fped/expr.c

@@ -100 +100 @@
 
 /* ----- primary expressions ----------------------------------------------- */
+
+
+struct num op_string(const struct expr *self, const struct frame *frame)
+{
+        fail("cannot evaluate string");
+        return undef;
+}
 
 

trunk/eda/fped/expr.h

@@ -44 +44 @@
                 struct num num;
                 const char *var;
+                char *str;
                 struct {
                         struct expr *a;
@@ -108 +109 @@
 struct num op_num(const struct expr *self, const struct frame *frame);
 struct num op_var(const struct expr *self, const struct frame *frame);
+struct num op_string(const struct expr *self, const struct frame *frame);
 
 struct num op_minus(const struct expr *self, const struct frame *frame);

trunk/eda/fped/fpd.y

@@ -531 +531 @@
                         $$->u.var = $1;
                 }
+        | STRING
+                {
+                        $$ = new_op(op_string);
+                        $$->u.str = $1;
+                }
         | '(' expr ')'
                 {

trunk/eda/fped/gui.c

@@ -713 +713 @@
 {
         GtkWidget *tab, *field;
-        GtkWidget *evbox;
+        GtkWidget *evbox, *align;
         struct var *var;
         struct row *row;
@@ -730 +730 @@
 
         evbox = gtk_event_box_new();
-        gtk_box_pack_start(GTK_BOX(vbox), evbox, FALSE, FALSE, 0);
+        align = gtk_alignment_new(0, 0, 0, 0);
+        gtk_container_add(GTK_CONTAINER(align), evbox);
+        gtk_box_pack_start(GTK_BOX(vbox), align, FALSE, FALSE, 0);
 
         tab = gtk_table_new(n_rows+1, n_vars, FALSE);