Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/indent indent: merge headers into a single file
details: https://anonhg.NetBSD.org/src/rev/8384cc9c410a
branches: trunk
changeset: 988632:8384cc9c410a
user: rillig <rillig%NetBSD.org@localhost>
date: Fri Oct 08 16:16:54 2021 +0000
description:
indent: merge headers into a single file
No functional change.
diffstat:
usr.bin/indent/indent.h | 301 +++++++++++++++++++++++++++++++++++++++++-
usr.bin/indent/indent_codes.h | 82 -----------
usr.bin/indent/indent_globs.h | 261 ------------------------------------
3 files changed, 298 insertions(+), 346 deletions(-)
diffs (truncated from 673 to 300 lines):
diff -r 125258c1bf82 -r 8384cc9c410a usr.bin/indent/indent.h
--- a/usr.bin/indent/indent.h Fri Oct 08 15:59:55 2021 +0000
+++ b/usr.bin/indent/indent.h Fri Oct 08 16:16:54 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: indent.h,v 1.30 2021/10/07 19:42:41 rillig Exp $ */
+/* $NetBSD: indent.h,v 1.31 2021/10/08 16:16:54 rillig Exp $ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
@@ -27,6 +27,42 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
+/*-
+ * SPDX-License-Identifier: BSD-4-Clause
+ *
+ * Copyright (c) 1985 Sun Microsystems, Inc.
+ * Copyright (c) 1980, 1993
+ * The Regents of the University of California. All rights reserved.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
#if 0
__FBSDID("$FreeBSD: head/usr.bin/indent/indent.h 336333 2018-07-16 05:46:50Z pstef $");
@@ -34,8 +70,267 @@
#include <stdbool.h>
-#include "indent_codes.h"
-#include "indent_globs.h"
+typedef enum token_type {
+ end_of_file,
+ newline,
+ lparen, /* '(' or '[' */
+ rparen, /* ')' or ']' */
+ unary_op, /* e.g. '+' or '&' */
+ binary_op, /* e.g. '<<' or '+' or '&&' or '/=' */
+ postfix_op, /* trailing '++' or '--' */
+ question, /* the '?' from a '?:' expression */
+ case_label,
+ colon,
+ semicolon,
+ lbrace,
+ rbrace,
+ ident, /* identifier, constant or string */
+ comma,
+ comment,
+ switch_expr, /* 'switch' '(' <expr> ')' */
+ preprocessing, /* '#' */
+ form_feed,
+ decl,
+ keyword_for_if_while, /* 'for', 'if' or 'while' */
+ keyword_do_else, /* 'do' or 'else' */
+ if_expr, /* 'if' '(' <expr> ')' */
+ while_expr, /* 'while' '(' <expr> ')' */
+ for_exprs, /* 'for' '(' ... ')' */
+ stmt,
+ stmt_list,
+ keyword_else, /* 'else' */
+ keyword_do, /* 'do' */
+ do_stmt, /* 'do' <stmt> */
+ if_expr_stmt, /* 'if' '(' <expr> ')' <stmt> */
+ if_expr_stmt_else, /* 'if' '(' <expr> ')' <stmt> 'else' */
+ period,
+ string_prefix, /* 'L' */
+ storage_class,
+ funcname,
+ type_def,
+ keyword_struct_union_enum
+} token_type;
+
+#define sc_size 5000 /* size of save_com buffer */
+#define label_offset 2 /* number of levels a label is placed to left
+ * of code */
+
+
+struct buffer {
+ char *buf; /* buffer */
+ char *s; /* start */
+ char *e; /* end */
+ char *l; /* limit */
+};
+
+extern FILE *input; /* the fid for the input file */
+extern FILE *output; /* the output file */
+
+extern struct buffer lab; /* label or preprocessor directive */
+extern struct buffer code; /* code */
+extern struct buffer com; /* comment */
+extern struct buffer token; /* the last token scanned */
+
+extern struct buffer inp;
+
+extern char sc_buf[sc_size]; /* input text is saved here when looking for
+ * the brace after an if, while, etc */
+extern char *save_com; /* start of the comment stored in sc_buf */
+
+extern char *saved_inp_s; /* saved value of inp.s when taking input
+ * from save_com */
+extern char *saved_inp_e; /* similarly saved value of inp.e */
+
+
+extern struct options {
+ bool blanklines_around_conditional_compilation;
+ bool blanklines_after_declarations_at_proctop; /* this is vaguely
+ * similar to blanklines_after_declarations
+ * except that it only applies to the first
+ * set of declarations in a procedure (just
+ * after the first '{') and it causes a blank
+ * line to be generated even if there are no
+ * declarations */
+ bool blanklines_after_declarations;
+ bool blanklines_after_procs;
+ bool blanklines_before_blockcomments;
+ bool break_after_comma; /* whether to break declarations after
+ * commas */
+ bool brace_same_line;/* whether brace should be on same line
+ * as if, while, etc */
+ bool blank_after_sizeof; /* whether a blank should always be
+ * inserted after sizeof */
+ bool comment_delimiter_on_blankline;
+ int decl_comment_column; /* the column in which comments after
+ * declarations should be put */
+ bool cuddle_else; /* whether 'else' should cuddle up to '}' */
+ int continuation_indent; /* the indentation between the
+ * edge of code and continuation lines */
+ float case_indent; /* The distance (measured in indentation
+ * levels) to indent case labels from the
+ * switch statement */
+ int comment_column; /* the column in which comments to the right
+ * of code should start */
+ int decl_indent; /* indentation of identifier in declaration */
+ bool ljust_decl; /* true if declarations should be left
+ * justified */
+ int unindent_displace; /* comments not to the right of code
+ * will be placed this many
+ * indentation levels to the left of
+ * code */
+ bool extra_expression_indent; /* whether continuation lines from
+ * the expression part of "if(e)",
+ * "while(e)", "for(e;e;e)" should be
+ * indented an extra tab stop so that they
+ * don't conflict with the code that follows */
+ bool else_if; /* whether else-if pairs should be handled
+ * specially */
+ bool function_brace_split; /* split function declaration and
+ * brace onto separate lines */
+ bool format_col1_comments; /* If comments which start in column 1
+ * are to be magically reformatted (just
+ * like comments that begin in later columns) */
+ bool format_block_comments; /* whether comments beginning with
+ * '/ * \n' are to be reformatted */
+ bool indent_parameters;
+ int indent_size; /* the size of one indentation level */
+ int block_comment_max_line_length;
+ int local_decl_indent; /* like decl_indent but for locals */
+ bool lineup_to_parens_always; /* whether to not(?) attempt to keep
+ * lined-up code within the margin */
+ bool lineup_to_parens; /* whether continued code within parens
+ * will be lined up to the open paren */
+ bool proc_calls_space; /* whether procedure calls look like:
+ * foo (bar) rather than foo(bar) */
+ bool procnames_start_line; /* whether the names of procedures
+ * being defined get placed in column 1 (i.e.
+ * a newline is placed between the type of
+ * the procedure and its name) */
+ bool space_after_cast; /* "b = (int) a" vs "b = (int)a" */
+ bool star_comment_cont; /* whether comment continuation lines
+ * should have stars at the beginning of
+ * each line. */
+ bool swallow_optional_blanklines;
+ bool auto_typedefs; /* whether to recognize identifiers
+ * ending in "_t" like typedefs */
+ int tabsize; /* the size of a tab */
+ int max_line_length;
+ bool use_tabs; /* set true to use tabs for spacing, false
+ * uses all spaces */
+ bool verbose; /* whether non-essential error messages
+ * are printed */
+} opt;
+
+enum keyword_kind {
+ kw_0,
+ kw_offsetof,
+ kw_sizeof,
+ kw_struct_or_union_or_enum,
+ kw_type,
+ kw_for_or_if_or_while,
+ kw_do_or_else,
+ kw_switch,
+ kw_case_or_default,
+ kw_jump,
+ kw_storage_class,
+ kw_typedef,
+ kw_inline_or_restrict
+};
+
+
+extern bool found_err;
+extern int next_blank_lines;
+extern bool prefix_blankline_requested;
+extern bool postfix_blankline_requested;
+extern bool break_comma; /* when true and not in parens, break after a
+ * comma */
+extern float case_ind; /* indentation level to be used for a "case
+ * n:" */
+extern bool had_eof; /* whether input is exhausted */
+extern int line_no; /* the current line number. */
+extern bool inhibit_formatting; /* true if INDENT OFF is in effect */
+
+#define STACKSIZE 256
+
+extern struct parser_state {
+ token_type last_token;
+ token_type p_stack[STACKSIZE]; /* this is the parser's stack */
+ int il[STACKSIZE]; /* this stack stores indentation levels */
+ float cstk[STACKSIZE];/* used to store case stmt indentation levels */
+ bool box_com; /* whether we are in a "boxed" comment. In
+ * that case, the first non-blank char should
+ * be lined up with the '/' in '/' + '*' */
+ int comment_delta; /* used to set up indentation for all lines
+ * of a boxed comment after the first one */
+ int n_comment_delta;/* remembers how many columns there were
+ * before the start of a box comment so that
+ * forthcoming lines of the comment are
+ * indented properly */
+ int cast_mask; /* indicates which close parens potentially
+ * close off casts */
+ int not_cast_mask; /* indicates which close parens definitely
+ * close off something else than casts */
+ bool block_init; /* whether inside a block initialization */
+ int block_init_level; /* The level of brace nesting in an
+ * initialization */
+ bool last_nl; /* whether the last thing scanned was
+ * a newline */
+ bool in_or_st; /* true iff there has been a
+ * declarator (e.g. int or char) and no left
+ * paren since the last semicolon. When true,
+ * a '{' is starting a structure definition or
+ * an initialization list */
+ bool col_1; /* whether the last token started in
+ * column 1 */
+ int com_col; /* this is the column in which the current
+ * comment should start */
+ int decl_nest; /* current nesting level for structure or init */
+ bool decl_on_line; /* whether this line of code has part
+ * of a declaration on it */
+ int ind_level_follow; /* the level to which ind_level should be set
+ * after the current line is printed */
+ bool in_decl; /* whether we are in a declaration stmt.
+ * The processing of braces is then slightly
+ * different */
+ bool in_stmt;
+ int ind_level; /* the current indentation level */
+ bool ind_stmt; /* whether the next line should have an extra
+ * indentation level because we are in the
+ * middle of a stmt */
+ bool last_u_d; /* whether the following operator should be
+ * unary */
+ int p_l_follow; /* used to remember how to indent the
+ * following statement */
+ int paren_level; /* parenthesization level. used to indent
+ * within statements */
+ short paren_indents[20]; /* indentation of the operand/argument of
+ * each level of parentheses or brackets,
+ * relative to the enclosing statement */
+ bool is_case_label; /* 'case' and 'default' labels are indented
+ * differently from regular labels */
+ bool search_brace; /* whether it is necessary
+ * to buffer up all info up to the start of a
+ * stmt after an if, while, etc */
+ bool use_ff; /* whether the current line should be
Home |
Main Index |
Thread Index |
Old Index