2009-08-03 19:12:47 +03:00
|
|
|
%{
|
|
|
|
/*
|
|
|
|
* fpd.l - FootPrint Definition language
|
|
|
|
*
|
2012-04-26 08:55:45 +03:00
|
|
|
* Written 2009, 2010, 2012 by Werner Almesberger
|
|
|
|
* Copyright 2009, 2010, 2012 by Werner Almesberger
|
2009-08-03 19:12:47 +03:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
|
|
|
#include "util.h"
|
|
|
|
#include "coord.h"
|
|
|
|
#include "expr.h"
|
|
|
|
#include "error.h"
|
2009-08-07 16:37:51 +03:00
|
|
|
#include "meas.h"
|
2009-08-16 07:12:37 +03:00
|
|
|
#include "fpd.h"
|
2009-08-03 19:12:47 +03:00
|
|
|
|
|
|
|
#include "y.tab.h"
|
|
|
|
|
|
|
|
|
2012-04-26 08:55:45 +03:00
|
|
|
static int start_token = START_FPD;
|
2009-08-03 19:12:47 +03:00
|
|
|
static int disable_keywords = 0;
|
|
|
|
static int is_table = 0;
|
|
|
|
|
|
|
|
|
|
|
|
void scan_empty(void)
|
|
|
|
{
|
|
|
|
yy_scan_string("");
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2012-08-21 07:59:46 +03:00
|
|
|
void scan_file(void)
|
|
|
|
{
|
|
|
|
start_token = START_FPD;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-08-03 19:12:47 +03:00
|
|
|
void scan_expr(const char *s)
|
|
|
|
{
|
|
|
|
start_token = START_EXPR;
|
|
|
|
yy_scan_string(s);
|
|
|
|
}
|
|
|
|
|
2009-08-16 07:12:37 +03:00
|
|
|
|
|
|
|
void scan_var(const char *s)
|
|
|
|
{
|
|
|
|
start_token = START_VAR;
|
|
|
|
yy_scan_string(s);
|
|
|
|
}
|
|
|
|
|
2009-08-16 08:05:12 +03:00
|
|
|
|
|
|
|
void scan_values(const char *s)
|
|
|
|
{
|
|
|
|
start_token = START_VALUES;
|
|
|
|
yy_scan_string(s);
|
|
|
|
}
|
|
|
|
|
2009-08-03 19:12:47 +03:00
|
|
|
%}
|
|
|
|
|
|
|
|
|
|
|
|
/* keywords are only accepted at the beginning of a line */
|
|
|
|
%s NOKEYWORD
|
Added relaxation of pad overlap checking. Not GUI-settable yet.
- README, fpd.l, fpd.y: added directives "allow touch" and "allow overlap" to
make overlap checking more permissive
- dump.c (dump_allow, dump): generate "allow" directive
- obj.h, obj.c (allow_overlap): added global variable for strictness of overlap
checking
- overlap.h, overlap.c (overlap, ...), layer.h, layer.c (refine_layers):
strictness of overlap checking is passed as an argument
- hole.c (check_through_hole), layer.h, layer.c (refine_copper), obj.c
(instantiate): updated callers of "overlap" to provide "allow" argument
git-svn-id: http://svn.openmoko.org/trunk/eda/fped@5974 99fdad57-331a-0410-800a-d7fa5415bdb3
2010-08-09 07:16:37 +03:00
|
|
|
/* ALLOW is followed by special keywords (we could use NOKEYWORD as well) */
|
|
|
|
%s ALLOW
|
2009-08-03 19:12:47 +03:00
|
|
|
|
|
|
|
NUM [0-9]+\.?[0-9]*
|
|
|
|
SP [\t ]*
|
|
|
|
|
|
|
|
|
|
|
|
%%
|
|
|
|
|
|
|
|
%{
|
|
|
|
/*
|
|
|
|
* Nice hack:
|
|
|
|
*
|
|
|
|
* http://www.gnu.org/software/bison/manual/bison.html#
|
|
|
|
* Multiple-start_002dsymbols
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (start_token) {
|
|
|
|
int tmp = start_token;
|
|
|
|
start_token = 0;
|
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
%}
|
|
|
|
|
|
|
|
|
|
|
|
<INITIAL>"set" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_SET; }
|
|
|
|
<INITIAL>"loop" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_LOOP; }
|
2009-08-06 09:54:41 +03:00
|
|
|
<INITIAL>"part" { BEGIN(NOKEYWORD);
|
2009-08-17 23:42:51 +03:00
|
|
|
return TOK_PACKAGE; }
|
|
|
|
<INITIAL>"package" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_PACKAGE; }
|
2009-08-03 19:12:47 +03:00
|
|
|
<INITIAL>"frame" { BEGIN(NOKEYWORD);
|
|
|
|
is_table = 0;
|
|
|
|
return TOK_FRAME; }
|
|
|
|
<INITIAL>"table" { BEGIN(NOKEYWORD);
|
|
|
|
is_table = 1;
|
|
|
|
return TOK_TABLE; }
|
|
|
|
<INITIAL>"vec" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_VEC; }
|
|
|
|
<INITIAL>"pad" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_PAD; }
|
2009-08-14 13:18:40 +03:00
|
|
|
<INITIAL>"rpad" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_RPAD; }
|
2010-04-25 13:58:07 +03:00
|
|
|
<INITIAL>"hole" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_HOLE; }
|
2009-08-03 19:12:47 +03:00
|
|
|
<INITIAL>"rect" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_RECT; }
|
|
|
|
<INITIAL>"line" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_LINE; }
|
|
|
|
<INITIAL>"circ" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_CIRC; }
|
|
|
|
<INITIAL>"arc" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_ARC; }
|
|
|
|
<INITIAL>"meas" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_MEAS; }
|
2009-08-07 16:37:51 +03:00
|
|
|
<INITIAL>"measx" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_MEASX; }
|
|
|
|
<INITIAL>"measy" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_MEASY; }
|
2009-08-22 18:58:58 +03:00
|
|
|
<INITIAL>"unit" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_UNIT; }
|
2009-08-03 19:12:47 +03:00
|
|
|
|
Added relaxation of pad overlap checking. Not GUI-settable yet.
- README, fpd.l, fpd.y: added directives "allow touch" and "allow overlap" to
make overlap checking more permissive
- dump.c (dump_allow, dump): generate "allow" directive
- obj.h, obj.c (allow_overlap): added global variable for strictness of overlap
checking
- overlap.h, overlap.c (overlap, ...), layer.h, layer.c (refine_layers):
strictness of overlap checking is passed as an argument
- hole.c (check_through_hole), layer.h, layer.c (refine_copper), obj.c
(instantiate): updated callers of "overlap" to provide "allow" argument
git-svn-id: http://svn.openmoko.org/trunk/eda/fped@5974 99fdad57-331a-0410-800a-d7fa5415bdb3
2010-08-09 07:16:37 +03:00
|
|
|
<INITIAL>"allow" BEGIN(ALLOW);
|
|
|
|
<ALLOW>"overlap" return TOK_ALLOW_OVERLAP;
|
|
|
|
<ALLOW>"touch" return TOK_ALLOW_TOUCH;
|
2012-12-21 03:03:58 +02:00
|
|
|
<ALLOW>"holes" return TOK_ALLOW_HOLES;
|
Added relaxation of pad overlap checking. Not GUI-settable yet.
- README, fpd.l, fpd.y: added directives "allow touch" and "allow overlap" to
make overlap checking more permissive
- dump.c (dump_allow, dump): generate "allow" directive
- obj.h, obj.c (allow_overlap): added global variable for strictness of overlap
checking
- overlap.h, overlap.c (overlap, ...), layer.h, layer.c (refine_layers):
strictness of overlap checking is passed as an argument
- hole.c (check_through_hole), layer.h, layer.c (refine_copper), obj.c
(instantiate): updated callers of "overlap" to provide "allow" argument
git-svn-id: http://svn.openmoko.org/trunk/eda/fped@5974 99fdad57-331a-0410-800a-d7fa5415bdb3
2010-08-09 07:16:37 +03:00
|
|
|
|
Added debugging directives to the fped language. They're describe at the end
of README.
- fpd.l, fpd.y, README: added debugging directives %del, %move, %print, %dump,
and %exit
- obj.h, fpd.y (find_obj, find_label, new_obj): objects can now be labeled
- obj.c (obj_anchors), inst.c (inst_anchors): gathering the list of anchors is
now a per-object function, not an instance "method". inst_anchors implements
the vector vs. object switch.
- inst.h, inst.c: removed all *_op_anchors functions
- expr.c (str_unit): in the past, we returned a malloc'ed string, but these
times are long gone. Thus, don't stralloc("").
git-svn-id: http://svn.openmoko.org/trunk/eda/fped@5919 99fdad57-331a-0410-800a-d7fa5415bdb3
2010-04-19 17:39:57 +03:00
|
|
|
<INITIAL>"%del" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_DBG_DEL; }
|
|
|
|
<INITIAL>"%move" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_DBG_MOVE; }
|
2010-04-27 04:02:24 +03:00
|
|
|
<INITIAL>"%frame" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_DBG_FRAME; }
|
Added debugging directives to the fped language. They're describe at the end
of README.
- fpd.l, fpd.y, README: added debugging directives %del, %move, %print, %dump,
and %exit
- obj.h, fpd.y (find_obj, find_label, new_obj): objects can now be labeled
- obj.c (obj_anchors), inst.c (inst_anchors): gathering the list of anchors is
now a per-object function, not an instance "method". inst_anchors implements
the vector vs. object switch.
- inst.h, inst.c: removed all *_op_anchors functions
- expr.c (str_unit): in the past, we returned a malloc'ed string, but these
times are long gone. Thus, don't stralloc("").
git-svn-id: http://svn.openmoko.org/trunk/eda/fped@5919 99fdad57-331a-0410-800a-d7fa5415bdb3
2010-04-19 17:39:57 +03:00
|
|
|
<INITIAL>"%print" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_DBG_PRINT; }
|
2012-05-27 20:09:40 +03:00
|
|
|
<INITIAL>"%iprint" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_DBG_IPRINT; }
|
The mechanism for selecting points for measurements reaches its limits when
using frames to encapsulate building blocks, e.g., like macros or functions in
a programming language. Since measurements only know about the frame containing
a vector but not the frames containing that frame, invocations of this frame
from different places can only be distinguished within the min/next/max scheme.
(See the example in README.)
To eliminate this limitation, one needs a way to tell fped to consider a point
only if it has been instantiated through a certain path, e.g., by requiring
some other frames to be visited in its instantiation. This increases the number
of distinct points available for measurements.
The mechanism chosen is to qualify a measurement point with frames that lead to
it. This list of outer frames does not have to include all frames. Without
qualifying, the old behaviour results.
Note that this doesn't cover all possible ways in which a point can appear in
different roles. Multiple frame references can also result from repeating the
same frame reference in the same parent frame. The current qualification
mechanism does not allow such paths to be distinguished. However, one can
always introduce intermediate frames for this purpose.
Furthermore, repetitions create multiple instances of a point, although in what
should be considered the same role.
- fpd.l: make scanner support free-format a little better by switching back to
keyword mode after frame braces. This way, one can write a simple frame in a
single line, which is useful for regression tests.
- fpd.l, fpd.y, README, test/dbg_meas: added %meas directive to print the
result of a measurement
- fpd.y, README: measurements can now be labeled. Note that, due to limitations
of the grammar, the first measurement cannot be labeled.
- error.h, error.c (yywarn): new function for non-fatal diagnostics that always
get reported to standard error
- bitset.h, bitset.c: functions to manipulate variable-size bit sets
- meas.h, fpd.y, README, test/meas_qual: added the means to specify qualifiers
for points used in measurements
- dump.c (print_meas_base, print_meas): dump qualifiers
- delete.c (delete_references, test/del_frame): delete measurements that
reference a frame being deleted in their qualifiers
- obj.h, obj.c (enumerate_frames, instantiate): enumerate all frames so that we
have an index into the bit vector of visited frames
- meas.h, meas.c (reset_samples, meas_post), obj.c (generate_vecs,
generate_frame, instantiate): record the set of frames visited for each
sample
- meas.c (meas_post): only treat two instances of a point as equivalent if the
set of frames visited of one of them is a superset of set of the other. In
this case, keep the union of the two sets.
- meas.h, meas.c (meas_find_min, meas_find_next, meas_find_max),
test/meas_qual: instantiate_meas_pkg only select points for which all frames
in the qualification have been visited
- gui_meas.c (is_min, is_next, is_max, is_a_next): updated for above change
- inst.h, inst.c (curr_frame, propagate_bbox, add_inst, inst_begin_frame,
inst_end_frame, inst_start): renamed curr_frame to frame_instantiating to
avoid clash with curr_frame in fpd.y
- inst.h, inst.c (find_meas_hint): make global
- test/structure, test/del_vec, test/del_frame: fped now warns if a measurement
is in an unlinked frame. Changed regressions tests to avoid this warning.
- test/Common: new function expect_grep to compare only part of the output
git-svn-id: http://svn.openmoko.org/trunk/eda/fped@5967 99fdad57-331a-0410-800a-d7fa5415bdb3
2010-05-30 00:13:48 +03:00
|
|
|
<INITIAL>"%meas" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_DBG_MEAS; }
|
Added debugging directives to the fped language. They're describe at the end
of README.
- fpd.l, fpd.y, README: added debugging directives %del, %move, %print, %dump,
and %exit
- obj.h, fpd.y (find_obj, find_label, new_obj): objects can now be labeled
- obj.c (obj_anchors), inst.c (inst_anchors): gathering the list of anchors is
now a per-object function, not an instance "method". inst_anchors implements
the vector vs. object switch.
- inst.h, inst.c: removed all *_op_anchors functions
- expr.c (str_unit): in the past, we returned a malloc'ed string, but these
times are long gone. Thus, don't stralloc("").
git-svn-id: http://svn.openmoko.org/trunk/eda/fped@5919 99fdad57-331a-0410-800a-d7fa5415bdb3
2010-04-19 17:39:57 +03:00
|
|
|
<INITIAL>"%dump" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_DBG_DUMP; }
|
|
|
|
<INITIAL>"%exit" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_DBG_EXIT; }
|
2010-04-26 18:18:01 +03:00
|
|
|
<INITIAL>"%tsort" { BEGIN(NOKEYWORD);
|
|
|
|
return TOK_DBG_TSORT; }
|
Added debugging directives to the fped language. They're describe at the end
of README.
- fpd.l, fpd.y, README: added debugging directives %del, %move, %print, %dump,
and %exit
- obj.h, fpd.y (find_obj, find_label, new_obj): objects can now be labeled
- obj.c (obj_anchors), inst.c (inst_anchors): gathering the list of anchors is
now a per-object function, not an instance "method". inst_anchors implements
the vector vs. object switch.
- inst.h, inst.c: removed all *_op_anchors functions
- expr.c (str_unit): in the past, we returned a malloc'ed string, but these
times are long gone. Thus, don't stralloc("").
git-svn-id: http://svn.openmoko.org/trunk/eda/fped@5919 99fdad57-331a-0410-800a-d7fa5415bdb3
2010-04-19 17:39:57 +03:00
|
|
|
|
2009-08-05 00:45:33 +03:00
|
|
|
<INITIAL>[a-zA-Z_][a-zA-Z_0-9]*: { *strchr(yytext, ':') = 0;
|
2009-08-03 19:12:47 +03:00
|
|
|
yylval.id = unique(yytext);
|
|
|
|
return LABEL; }
|
|
|
|
[a-zA-Z_][a-zA-Z_0-9]* { yylval.id = unique(yytext);
|
|
|
|
return ID; }
|
|
|
|
|
|
|
|
{NUM}{SP}mm { yylval.num.type = nt_mm;
|
|
|
|
yylval.num.exponent = 1;
|
|
|
|
sscanf(yytext, "%lf", &yylval.num.n);
|
|
|
|
return NUMBER; }
|
|
|
|
{NUM}{SP}mil { yylval.num.type = nt_mil;
|
|
|
|
yylval.num.exponent = 1;
|
|
|
|
sscanf(yytext, "%lf", &yylval.num.n);
|
|
|
|
return NUMBER; }
|
|
|
|
{NUM} { yylval.num.type = nt_mm; /* mm or mil */
|
|
|
|
yylval.num.exponent = 0;
|
|
|
|
sscanf(yytext, "%lf", &yylval.num.n);
|
|
|
|
return NUMBER; }
|
|
|
|
|
|
|
|
\"(\\[^\n\t]|[^\\"\n\t])*\" { *strrchr(yytext, '"') = 0;
|
|
|
|
yylval.str = stralloc(yytext+1);
|
|
|
|
return STRING; }
|
|
|
|
|
2009-08-07 16:37:51 +03:00
|
|
|
"->" return TOK_NEXT;
|
|
|
|
"<-" return TOK_NEXT_INVERTED;
|
|
|
|
">>" return TOK_MAX;
|
|
|
|
"<<" return TOK_MAX_INVERTED;
|
|
|
|
|
2009-08-03 19:12:47 +03:00
|
|
|
{SP} ;
|
|
|
|
\n { if (!disable_keywords)
|
|
|
|
BEGIN(INITIAL);
|
|
|
|
lineno++; }
|
|
|
|
|
2009-08-03 20:58:32 +03:00
|
|
|
; BEGIN(INITIAL);
|
|
|
|
|
The mechanism for selecting points for measurements reaches its limits when
using frames to encapsulate building blocks, e.g., like macros or functions in
a programming language. Since measurements only know about the frame containing
a vector but not the frames containing that frame, invocations of this frame
from different places can only be distinguished within the min/next/max scheme.
(See the example in README.)
To eliminate this limitation, one needs a way to tell fped to consider a point
only if it has been instantiated through a certain path, e.g., by requiring
some other frames to be visited in its instantiation. This increases the number
of distinct points available for measurements.
The mechanism chosen is to qualify a measurement point with frames that lead to
it. This list of outer frames does not have to include all frames. Without
qualifying, the old behaviour results.
Note that this doesn't cover all possible ways in which a point can appear in
different roles. Multiple frame references can also result from repeating the
same frame reference in the same parent frame. The current qualification
mechanism does not allow such paths to be distinguished. However, one can
always introduce intermediate frames for this purpose.
Furthermore, repetitions create multiple instances of a point, although in what
should be considered the same role.
- fpd.l: make scanner support free-format a little better by switching back to
keyword mode after frame braces. This way, one can write a simple frame in a
single line, which is useful for regression tests.
- fpd.l, fpd.y, README, test/dbg_meas: added %meas directive to print the
result of a measurement
- fpd.y, README: measurements can now be labeled. Note that, due to limitations
of the grammar, the first measurement cannot be labeled.
- error.h, error.c (yywarn): new function for non-fatal diagnostics that always
get reported to standard error
- bitset.h, bitset.c: functions to manipulate variable-size bit sets
- meas.h, fpd.y, README, test/meas_qual: added the means to specify qualifiers
for points used in measurements
- dump.c (print_meas_base, print_meas): dump qualifiers
- delete.c (delete_references, test/del_frame): delete measurements that
reference a frame being deleted in their qualifiers
- obj.h, obj.c (enumerate_frames, instantiate): enumerate all frames so that we
have an index into the bit vector of visited frames
- meas.h, meas.c (reset_samples, meas_post), obj.c (generate_vecs,
generate_frame, instantiate): record the set of frames visited for each
sample
- meas.c (meas_post): only treat two instances of a point as equivalent if the
set of frames visited of one of them is a superset of set of the other. In
this case, keep the union of the two sets.
- meas.h, meas.c (meas_find_min, meas_find_next, meas_find_max),
test/meas_qual: instantiate_meas_pkg only select points for which all frames
in the qualification have been visited
- gui_meas.c (is_min, is_next, is_max, is_a_next): updated for above change
- inst.h, inst.c (curr_frame, propagate_bbox, add_inst, inst_begin_frame,
inst_end_frame, inst_start): renamed curr_frame to frame_instantiating to
avoid clash with curr_frame in fpd.y
- inst.h, inst.c (find_meas_hint): make global
- test/structure, test/del_vec, test/del_frame: fped now warns if a measurement
is in an unlinked frame. Changed regressions tests to avoid this warning.
- test/Common: new function expect_grep to compare only part of the output
git-svn-id: http://svn.openmoko.org/trunk/eda/fped@5967 99fdad57-331a-0410-800a-d7fa5415bdb3
2010-05-30 00:13:48 +03:00
|
|
|
"{" { disable_keywords = is_table;
|
|
|
|
BEGIN(disable_keywords ?
|
|
|
|
NOKEYWORD : INITIAL);
|
2009-08-03 19:12:47 +03:00
|
|
|
return '{'; }
|
|
|
|
"}" { disable_keywords = 0;
|
The mechanism for selecting points for measurements reaches its limits when
using frames to encapsulate building blocks, e.g., like macros or functions in
a programming language. Since measurements only know about the frame containing
a vector but not the frames containing that frame, invocations of this frame
from different places can only be distinguished within the min/next/max scheme.
(See the example in README.)
To eliminate this limitation, one needs a way to tell fped to consider a point
only if it has been instantiated through a certain path, e.g., by requiring
some other frames to be visited in its instantiation. This increases the number
of distinct points available for measurements.
The mechanism chosen is to qualify a measurement point with frames that lead to
it. This list of outer frames does not have to include all frames. Without
qualifying, the old behaviour results.
Note that this doesn't cover all possible ways in which a point can appear in
different roles. Multiple frame references can also result from repeating the
same frame reference in the same parent frame. The current qualification
mechanism does not allow such paths to be distinguished. However, one can
always introduce intermediate frames for this purpose.
Furthermore, repetitions create multiple instances of a point, although in what
should be considered the same role.
- fpd.l: make scanner support free-format a little better by switching back to
keyword mode after frame braces. This way, one can write a simple frame in a
single line, which is useful for regression tests.
- fpd.l, fpd.y, README, test/dbg_meas: added %meas directive to print the
result of a measurement
- fpd.y, README: measurements can now be labeled. Note that, due to limitations
of the grammar, the first measurement cannot be labeled.
- error.h, error.c (yywarn): new function for non-fatal diagnostics that always
get reported to standard error
- bitset.h, bitset.c: functions to manipulate variable-size bit sets
- meas.h, fpd.y, README, test/meas_qual: added the means to specify qualifiers
for points used in measurements
- dump.c (print_meas_base, print_meas): dump qualifiers
- delete.c (delete_references, test/del_frame): delete measurements that
reference a frame being deleted in their qualifiers
- obj.h, obj.c (enumerate_frames, instantiate): enumerate all frames so that we
have an index into the bit vector of visited frames
- meas.h, meas.c (reset_samples, meas_post), obj.c (generate_vecs,
generate_frame, instantiate): record the set of frames visited for each
sample
- meas.c (meas_post): only treat two instances of a point as equivalent if the
set of frames visited of one of them is a superset of set of the other. In
this case, keep the union of the two sets.
- meas.h, meas.c (meas_find_min, meas_find_next, meas_find_max),
test/meas_qual: instantiate_meas_pkg only select points for which all frames
in the qualification have been visited
- gui_meas.c (is_min, is_next, is_max, is_a_next): updated for above change
- inst.h, inst.c (curr_frame, propagate_bbox, add_inst, inst_begin_frame,
inst_end_frame, inst_start): renamed curr_frame to frame_instantiating to
avoid clash with curr_frame in fpd.y
- inst.h, inst.c (find_meas_hint): make global
- test/structure, test/del_vec, test/del_frame: fped now warns if a measurement
is in an unlinked frame. Changed regressions tests to avoid this warning.
- test/Common: new function expect_grep to compare only part of the output
git-svn-id: http://svn.openmoko.org/trunk/eda/fped@5967 99fdad57-331a-0410-800a-d7fa5415bdb3
2010-05-30 00:13:48 +03:00
|
|
|
BEGIN(INITIAL);
|
2009-08-03 19:12:47 +03:00
|
|
|
return '}'; }
|
|
|
|
|
|
|
|
^#\ [0-9]+\ \"[^"]*\"(\ [0-9]+)*\n {
|
|
|
|
if (!disable_keywords)
|
2012-05-28 09:11:15 +03:00
|
|
|
BEGIN(INITIAL);
|
2009-08-03 19:12:47 +03:00
|
|
|
lineno = strtol(yytext+2, NULL, 0); }
|
|
|
|
|
|
|
|
. return *yytext;
|