X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f16b08196c780556cbf50691e2944960aebc46f6..c826013fb38c98861ef0fc5d4dc3fb3fb4f555be:/data/c.m4 diff --git a/data/c.m4 b/data/c.m4 index 955edee6..e7308be3 100644 --- a/data/c.m4 +++ b/data/c.m4 @@ -1,7 +1,7 @@ -*- Autoconf -*- # C M4 Macros for Bison. -# Copyright (C) 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2002, 2004-2010 Free Software Foundation, Inc. # 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 @@ -20,36 +20,62 @@ ## Identification. ## ## ---------------- ## -# b4_comment(TEXT) -# ---------------- -m4_define([b4_comment], [/* m4_bpatsubst([$1], [ -], [ - ]) */]) +# b4_comment_(TEXT, OPEN, CONTINUE, END) +# ------------------------------------- +# Put TEXT in comment. Avoid trailing spaces: don't indent empty lines. +# Avoid adding indentation to the first line, as the indentation comes +# from OPEN. That's why we don't patsubst([$1], [^\(.\)], [ \1]). +# +# Prefix all the output lines with PREFIX. +m4_define([b4_comment_], [$2[]m4_bpatsubst([$1], [ +\(.\)], [ +$3\1])$4]) + + +# b4_c_comment(TEXT, [PREFIX]) +# ---------------------------- +# Put TEXT in comment. Avoid trailing spaces: don't indent empty lines. +# Avoid adding indentation to the first line, as the indentation comes +# from "/*". That's why we don't patsubst([$1], [^\(.\)], [ \1]). +# +# Prefix all the output lines with PREFIX. +m4_define([b4_c_comment], +[b4_comment_([$1], [$2/* ], [$2 ], [$2 */])]) + + +# b4_comment(TEXT, [PREFIX]) +# -------------------------- +# By default, C comments. +m4_define([b4_comment], [b4_c_comment($@)]) + # b4_identification # ----------------- +# Depends on individual skeletons to define b4_pure_flag, b4_push_flag, or +# b4_pull_flag if they use the values of the %define variables api.pure or +# api.push-pull. m4_define([b4_identification], -[/* Identify Bison output. */ -[#]define YYBISON 1 +[[/* Identify Bison output. */ +#define YYBISON 1 /* Bison version. */ -[#]define YYBISON_VERSION "b4_version" +#define YYBISON_VERSION "]b4_version[" /* Skeleton name. */ -[#]define YYSKELETON_NAME b4_skeleton +#define YYSKELETON_NAME ]b4_skeleton[]m4_ifdef([b4_pure_flag], [[ /* Pure parsers. */ -[#]define YYPURE b4_pure_flag +#define YYPURE ]b4_pure_flag])[]m4_ifdef([b4_push_flag], [[ /* Push parsers. */ -[#]define YYPUSH b4_push_flag +#define YYPUSH ]b4_push_flag])[]m4_ifdef([b4_pull_flag], [[ /* Pull parsers. */ -[#]define YYPULL b4_pull_flag +#define YYPULL ]b4_pull_flag])[ /* Using locations. */ -[#]define YYLSP_NEEDED b4_locations_flag -]) +#define YYLSP_NEEDED ]b4_locations_if([1], [0])[ +]]) ## ---------------- ## @@ -86,7 +112,7 @@ b4_parse_param) # the formal name to FORMAL, and evaluating the BODY. m4_define([b4_parse_param_for], [m4_foreach([$1_$2], m4_defn([b4_parse_param]), -[m4_pushdef([$1], m4_fst($1_$2))dnl +[m4_pushdef([$1], m4_unquote(m4_car($1_$2)))dnl m4_pushdef([$2], m4_shift($1_$2))dnl $3[]dnl m4_popdef([$2])dnl @@ -129,6 +155,19 @@ m4_define([b4_int_type], m4_define([b4_int_type_for], [b4_int_type($1_min, $1_max)]) + +# b4_table_value_equals(TABLE, VALUE, LITERAL) +# -------------------------------------------- +# Without inducing a comparison warning from the compiler, check if the +# literal value LITERAL equals VALUE from table TABLE, which must have +# TABLE_min and TABLE_max defined. YYID must be defined as an identity +# function that suppresses warnings about constant conditions. +m4_define([b4_table_value_equals], +[m4_if(m4_eval($3 < m4_indir([b4_]$1[_min]) + || m4_indir([b4_]$1[_max]) < $3), [1], + [[YYID (0)]], + [[((]$2[) == (]$3[))]])]) + ## ---------## ## Values. ## ## ---------## @@ -140,6 +179,19 @@ m4_define([b4_int_type_for], m4_define([b4_null], [0]) +# b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT) +# ------------------------------------------------------------- +# Define "yy" which contents is CONTENT. +m4_define([b4_integral_parser_table_define], +[m4_ifval([$3], [b4_c_comment([$3], [ ]) +])dnl +static const b4_int_type_for([$2]) yy$1[[]] = +{ + $2 +};dnl +]) + + ## ------------------------- ## ## Assigning token numbers. ## ## ------------------------- ## @@ -148,7 +200,7 @@ m4_define([b4_null], [0]) # ----------------------------------------- # Output the definition of this token as #define. m4_define([b4_token_define], -[#define $1 $2 +[#define b4_percent_define_get([api.tokens.prefix])$1 $2 ]) @@ -156,7 +208,7 @@ m4_define([b4_token_define], # ------------------------------------------------------- # Output the definition of the tokens (if there are) as #defines. m4_define([b4_token_defines], -[m4_if([$@], [[]], [], +[m4_if([$#$1], [1], [], [/* Tokens. */ m4_map([b4_token_define], [$@])]) ]) @@ -166,14 +218,14 @@ m4_map([b4_token_define], [$@])]) # --------------------------------------- # Output the definition of this token as an enum. m4_define([b4_token_enum], -[$1 = $2]) +[b4_percent_define_get([api.tokens.prefix])$1 = $2]) # b4_token_enums(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER) # ----------------------------------------------------- # Output the definition of the tokens (if there are) as enums. m4_define([b4_token_enums], -[m4_if([$@], [[]], [], +[m4_if([$#$1], [1], [], [/* Tokens. */ #ifndef YYTOKENTYPE # define YYTOKENTYPE @@ -197,6 +249,21 @@ m4_define([b4_token_enums_defines], ]) +## ----------------- ## +## Semantic Values. ## +## ----------------- ## + + +# b4_symbol_value(VAL, [TYPE]) +# ---------------------------- +# Given a semantic value VAL ($$, $1 etc.), extract its value of type +# TYPE if TYPE is given, otherwise just return VAL. The result can be +# used safetly, it is put in parens to avoid nasty precedence issues. +# TYPE is *not* put in braces, provide some if needed. +m4_define([b4_symbol_value], +[($1[]m4_ifval([$2], [.$2]))]) + + ## --------------------------------------------- ## ## Defining C functions in both K&R and ANSI-C. ## @@ -225,8 +292,8 @@ m4_define([b4_c_function_def], b4_c_ansi_function_def($@) #else $2 -$1 (b4_c_knr_formal_names(m4_shiftn(2, $@))) -b4_c_knr_formal_decls(m4_shiftn(2, $@)) +$1 (b4_c_knr_formal_names(m4_shift2($@))) +b4_c_knr_formal_decls(m4_shift2($@)) #endif[]dnl ]) @@ -236,7 +303,7 @@ b4_c_knr_formal_decls(m4_shiftn(2, $@)) # Declare the function NAME in ANSI. m4_define([b4_c_ansi_function_def], [$2 -$1 (b4_c_ansi_formals(m4_shiftn(2, $@)))[]dnl +$1 (b4_c_ansi_formals(m4_shift2($@)))[]dnl ]) @@ -244,9 +311,8 @@ $1 (b4_c_ansi_formals(m4_shiftn(2, $@)))[]dnl # -------------------------------------- # Output the arguments ANSI-C definition. m4_define([b4_c_ansi_formals], -[m4_case([$@], - [], [void], - [[]], [void], +[m4_if([$#], [0], [void], + [$#$1], [1], [void], [m4_map_sep([b4_c_ansi_formal], [, ], [$@])])]) m4_define([b4_c_ansi_formal], @@ -286,7 +352,7 @@ m4_define([b4_c_knr_formal_decl], # ----------------------------------------------------------- # Declare the function NAME. m4_define([b4_c_function_decl], -[#if defined __STDC__ || defined __cplusplus +[#if b4_c_modern b4_c_ansi_function_decl($@) #else $2 $1 (); @@ -298,7 +364,7 @@ $2 $1 (); # ---------------------------------------------------------------- # Declare the function NAME. m4_define([b4_c_ansi_function_decl], -[$2 $1 (b4_c_ansi_formals(m4_shiftn(2, $@)));[]dnl +[$2 $1 (b4_c_ansi_formals(m4_shift2($@)));[]dnl ]) @@ -313,7 +379,7 @@ m4_define([b4_c_ansi_function_decl], # ----------------------------------------------------------- # Call the function NAME with arguments NAME1, NAME2 etc. m4_define([b4_c_function_call], -[$1 (b4_c_args(m4_shiftn(2, $@)))[]dnl +[$1 (b4_c_args(m4_shift2($@)))[]dnl ]) @@ -345,24 +411,8 @@ m4_define([b4_sync_start], [[#]line $1 $2]) m4_define([b4_case], [ case $1: $2 - break;]) - -# b4_symbol_actions(FILENAME, LINENO, -# SYMBOL-TAG, SYMBOL-NUM, -# SYMBOL-ACTION, SYMBOL-TYPENAME) -# ------------------------------------------------- -m4_define([b4_symbol_actions], -[m4_pushdef([b4_dollar_dollar], - [m4_ifval([$6], [(yyvaluep->$6)], [(*yyvaluep)])])dnl -m4_pushdef([b4_at_dollar], [(*yylocationp)])dnl - case $4: /* $3 */ -b4_syncline([$2], [$1]) - $5; b4_syncline([@oline@], [@ofile@]) - break; -m4_popdef([b4_at_dollar])dnl -m4_popdef([b4_dollar_dollar])dnl -]) + break;]) # b4_yydestruct_generate(FUNCTION-DECLARATOR) @@ -395,8 +445,8 @@ b4_parse_param_use[]dnl switch (yytype) { -]m4_map([b4_symbol_actions], m4_defn([b4_symbol_destructors]))[ - default: +]b4_symbol_foreach([b4_symbol_destructor])dnl +[ default: break; } }]dnl @@ -436,7 +486,7 @@ b4_parse_param_use[]dnl # endif switch (yytype) { -]m4_map([b4_symbol_actions], m4_defn([b4_symbol_printers]))dnl +]b4_symbol_foreach([b4_symbol_printer])dnl [ default: break; }