TMP (b7bf0d6c) · Commits · 戴 / Bird

filter/config.Y

+32 −7

Original line number	Diff line number	Diff line
		@@ -181,6 +181,27 @@ f_generate_empty(struct f_dynamic_attr dyn)
		return s;
		}

		static inline struct f_inst *
		f_generate_dpair(struct f_inst t1, struct f_inst t2)
		{
		struct f_inst *rv = f_new_inst(fi_pair_construct);
		rv->a1.p = t1;
		rv->a2.p = t2;
		return rv;
		}

		static inline struct f_inst *
		f_generate_ec(u16 kind, struct f_inst tk, struct f_inst tv)
		{
		struct f_inst *rv = f_new_inst(fi_ec_construct);
		rv->aux = kind;
		rv->a1.p = tk;
		rv->a2.p = tv;
		return rv;
		}

		#if 0
		/* TODO: Convert to instructions! */

		static inline struct f_inst *
		f_generate_dpair(struct f_inst t1, struct f_inst t2)
		@@ -288,11 +309,14 @@ f_generate_ec(u16 kind, struct f_inst tk, struct f_inst tv)
		return rv;
		}

		#endif

		static inline struct f_inst *
		f_generate_lc(struct f_inst t1, struct f_inst t2, struct f_inst *t3)
		{
		struct f_inst *rv;

		#if 0 /* TODO move constant expansion elsewhere */
		if ((t1->code == 'c') && (t2->code == 'c') && (t3->code == 'c')) {
		if ((t1->aux != T_INT) \|\| (t2->aux != T_INT) \|\| (t3->aux != T_INT))
		cf_error( "LC - Can't operate with value of non-integer type in tuple constructor");
		@@ -305,10 +329,11 @@ f_generate_lc(struct f_inst t1, struct f_inst t2, struct f_inst *t3)
		val->val.lc = (lcomm) { t1->a2.i, t2->a2.i, t3->a2.i };
		}
		else
		#endif
		{
		rv = cfg_allocz(sizeof(struct f_inst3));
		rv->lineno = ifs->lino;
		rv->code = P('m','l');
		rv->fi_code = fi_lc_construct;
		rv->a1.p = t1;
		rv->a2.p = t2;
		INST3(rv).p = t3;
		@@ -723,7 +748,7 @@ constructor:
		* For such cases, we force the dynamic_attr list to contain
		* at least an invalid token, so it is syntantically correct.
		*/
		CF_ADDTO(dynamic_attr, INVALID_TOKEN { $$ = NULL; })
		CF_ADDTO(dynamic_attr, INVALID_TOKEN { $$ = (struct f_dynamic_attr) {}; })

		rtadot: /* EMPTY, we are not permitted RTA. prefix */
		;
		@@ -922,7 +947,7 @@ cmd:
		$$->a1.p = $2;
		}
		\| rtadot dynamic_attr '=' term ';' {
		$$ = f_new_inst(fi_ea_set, $2);
		$$ = f_new_inst_da(fi_ea_set, $2);
		$$->a1.p = $4;
		}
		\| rtadot static_attr '=' term ';' {
		@@ -950,10 +975,10 @@ cmd:


		\| rtadot dynamic_attr '.' EMPTY ';' { $$ = f_generate_empty($2); }
		\| rtadot dynamic_attr '.' PREPEND '(' term ')' ';' { $$ = f_generate_complex( P('A','p'), 'x', $2, $6 ); }
		\| rtadot dynamic_attr '.' ADD '(' term ')' ';' { $$ = f_generate_complex( P('C','a'), 'a', $2, $6 ); }
		\| rtadot dynamic_attr '.' DELETE '(' term ')' ';' { $$ = f_generate_complex( P('C','a'), 'd', $2, $6 ); }
		\| rtadot dynamic_attr '.' FILTER '(' term ')' ';' { $$ = f_generate_complex( P('C','a'), 'f', $2, $6 ); }
		\| rtadot dynamic_attr '.' PREPEND '(' term ')' ';' { $$ = f_generate_complex( fi_path_prepend, 'x', $2, $6 ); }
		\| rtadot dynamic_attr '.' ADD '(' term ')' ';' { $$ = f_generate_complex( fi_clist_add_del, 'a', $2, $6 ); }
		\| rtadot dynamic_attr '.' DELETE '(' term ')' ';' { $$ = f_generate_complex( fi_clist_add_del, 'd', $2, $6 ); }
		\| rtadot dynamic_attr '.' FILTER '(' term ')' ';' { $$ = f_generate_complex( fi_clist_add_del, 'f', $2, $6 ); }
		;

		CF_END

filter/f-util.c

+7 −5

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		#define P(a,b) ((a<<8) \| b)

		struct f_inst *
		f_new_inst(enum filter_instruction_code fi_code, struct f_dynamic_attr da)
		f_new_inst(enum filter_instruction_code fi_code)
		{
		struct f_inst * ret;
		ret = cfg_alloc(sizeof(struct f_inst));
		@@ -31,14 +31,16 @@ f_new_inst_da(enum filter_instruction_code fi_code, struct f_dynamic_attr da)
		struct f_inst *ret = f_new_inst(fi_code);
		ret->aux = da.type;
		ret->a2.i = da.ea_code;
		return ret;
		}

		struct f_inst *
		f_new_inst_sa(enum filter_instruction_code fi_code, struct f_static_attr sa)
		{
		struct f_inst *ret = f_new_inst(fi_code);
		ret->aux = sa.type;
		ret->aux = sa.f_type;
		ret->a2.i = sa.sa_code;
		return ret;
		}

		/*
		@@ -47,9 +49,9 @@ f_new_inst_sa(enum filter_instruction_code fi_code, struct f_static_attr sa)
		struct f_inst *
		f_generate_complex(int operation, int operation_aux, struct f_dynamic_attr da, struct f_inst *argument)
		{
		struct f_inst *set_dyn = f_new_inst(fi_ea_get, da),
		struct f_inst *set_dyn = f_new_inst_da(fi_ea_get, da),
		*oper = f_new_inst(operation),
		*get_dyn = f_new_inst(fi_ea_set, da);
		*get_dyn = f_new_inst_da(fi_ea_set, da);

		oper->aux = operation_aux;
		oper->a1.p = get_dyn;
		@@ -64,7 +66,7 @@ struct f_inst *
		f_generate_roa_check(struct symbol sym, struct f_inst prefix, struct f_inst *asn)
		{
		struct f_inst_roa_check *ret = cfg_allocz(sizeof(struct f_inst_roa_check));
		ret->i.code = P('R','C');
		ret->i.fi_code = fi_roa_check;
		ret->i.lineno = ifs->lino;
		ret->i.arg1 = prefix;
		ret->i.arg2 = asn;

filter/filter.c

+5 −864

File changed.

Preview size limit exceeded, changes collapsed.

filter/interpret.h

0 → 100644

+874 −0

File added.

Preview size limit exceeded, changes collapsed.

Admin message