Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 02:28:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge remote branch 'origin/topic/jsiwek/doc-framework'

Browse source
This commit is contained in:
Robin Sommer 2011-04-18 14:50:35 -07:00
commit e7bde27f2d
54 changed files with 4006 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/builtin-func.y
View file

@ -296,7 +296,12 @@ builtin_lang: definitions
definitions: definitions definition opt_ws
{ fprintf(fp_func_def, "%s", $3); }
{
if ( in_c_code )
fprintf(fp_func_def, "%s", $3);
else
fprintf(fp_bro_init, "%s", $3);
}
| opt_ws
{
int n = 1024 + strlen(input_filename);
@ -695,7 +700,12 @@ opt_ws: opt_ws TOK_WS
if ( in_c_code )
$$ = concat($1, $2);
else
$$ = $1;
if ( $2[1] == '#' )
// This is a special type of comment that is used to
// generate bro script documentation, so pass it through.
$$ = concat($1, $2);
else
$$ = $1;
}
| /* empty */
{ $$ = ""; }