Return to regress.c CVS log

Up to [local] / src / usr.bin / make

Mostly clean-up:
- cut up those huge include files into separate interfaces for all modules.
Put the interface documentation there, and not with the implementation.
- light-weight includes for needed concrete types (lst_t.h, timestamp_t.h).
- cut out some more logically separate parts: cmd_exec, varname, parsevar,
timestamp.
- put all error handling functions together, so that we will be able to
clean them up.
- more systematic naming: functioni  to handle interval, function to handle
string.
- put the init/end code apart to minimize coupling.
- kill weird types like ReturnStatus and Boolean. Use standard bool (with a
fallback for non-iso systems)
- better interface documentation for lots of subsystems.

As a result, make compilation goes somewhat faster (5%, even considering
the largish BSD copyrights to read). The corresponding preprocessed
source goes down from 1,5M to 1M.

A few minor code changes as well: Parse_DoVar is no longer destructive.
Parse_IsVar functionality is folded into Parse_DoVar (as it knows what an
assignment is), a few more interval handling functions. Avoid calling
XXX_End when they do nothing, just #define XXX_End   to nothing.

Parse_DoVar is slightly more general: it will handle compound assignments
as long as they make sense, e.g., VAR +!= cmd
will work.  As a side effect, VAR++=value now triggers an error
(two + in assignment).
- this stuff doesn't occur in portable Makefiles.
- writing VAR++ = value or VAR+ +=value  disambiguates it.
- this is a good thing, it uncovered a bug in bsd.port.mk.

Tested by naddy@. Okayed millert@. I'll handle the fallback if there is
any. This went through a full make build anyways, including isakmpd
(without mickey's custom binutils, as he didn't see fit to share it with me).

/* $OpenPackages$ */
/* $OpenBSD: regress.c,v 1.4 2001/05/23 12:34:48 espie Exp $ */

/*
 * Copyright (c) 1999 Marc Espie.
 *
 * Code written for the OpenBSD project.
 *
 * 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.
 *
 * THIS SOFTWARE IS PROVIDED BY THE OPENBSD PROJECT 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 OPENBSD
 * PROJECT 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.
 */

/* regression tests */
#include <stdio.h>
#include <string.h>
#include "defines.h"
#include "str.h"

int main(void);
#define CHECK(s)		\
do {				\
    printf("%-65s", #s);	\
    if (s)			\
	printf("ok\n"); 	\
    else {			\
	printf("failed\n");	\
	errors++;		\
    }				\
} while (0);

int
main()
{
    unsigned int errors = 0;

    CHECK(Str_Match("string", "string") == true);
    CHECK(Str_Match("string", "string2") == false);
    CHECK(Str_Match("string", "string*") == true);
    CHECK(Str_Match("Long string", "Lo*ng") == true);
    CHECK(Str_Match("Long string", "Lo*ng ") == false);
    CHECK(Str_Match("Long string", "Lo*ng *") == true);
    CHECK(Str_Match("string", "stri?g") == true);
    CHECK(Str_Match("str?ng", "str\\?ng") == true);
    CHECK(Str_Match("striiiing", "str?*ng") == true);
    CHECK(Str_Match("Very long string just to see", "******a****") == false);
    CHECK(Str_Match("d[abc?", "d\\[abc\\?") == true);
    CHECK(Str_Match("d[abc!", "d\\[abc\\?") == false);
    CHECK(Str_Match("dwabc?", "d\\[abc\\?") == false);
    CHECK(Str_Match("da0", "d[bcda]0") == true);
    CHECK(Str_Match("da0", "d[z-a]0") == true);
    CHECK(Str_Match("d-0", "d[-a-z]0") == true);
    CHECK(Str_Match("dy0", "d[a\\-z]0") == false);
    CHECK(Str_Match("d-0", "d[a\\-z]0") == true);
    CHECK(Str_Match("dz0", "d[a\\]z]0") == true);

    if (errors != 0)
	printf("Errors: %d\n", errors);
    exit(0);
}