From owner-p4-projects@FreeBSD.ORG Thu Jun 20 14:16:37 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E3D576F0; Thu, 20 Jun 2013 14:16:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id A08216EE for ; Thu, 20 Jun 2013 14:16:36 +0000 (UTC) (envelope-from jonathan@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks6.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id 752491C01 for ; Thu, 20 Jun 2013 14:16:36 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5KEGZgi088647 for ; Thu, 20 Jun 2013 14:16:35 GMT (envelope-from jonathan@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5KEGZrW088644 for perforce@freebsd.org; Thu, 20 Jun 2013 14:16:35 GMT (envelope-from jonathan@freebsd.org) Date: Thu, 20 Jun 2013 14:16:35 GMT Message-Id: <201306201416.r5KEGZrW088644@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jonathan@freebsd.org using -f From: Jonathan Anderson Subject: PERFORCE change 229999 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Jun 2013 14:16:37 -0000 http://p4web.freebsd.org/@@229999?ac=10 Change 229999 by jonathan@jonathan-on-zenith on 2013/06/20 14:15:48 Pull in updated tesla-macros.h Affected files ... .. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla-macros.h#5 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla-macros.h#5 (text+ko) ==== @@ -64,29 +64,29 @@ /** An assertion in a thread's TESLA context. */ #define TESLA_PERTHREAD(...) TESLA_ASSERT(__tesla_perthread, __VA_ARGS__) +/** An epsilon transition in a a TESLA NFA; a non-event. */ +#define TIGNORE __tesla_ignore + /** A strictly-ordered sequence of events. */ -#define TSEQUENCE(...) __tesla_sequence(__tesla_ignore, __VA_ARGS__) +#define TSEQUENCE(...) __tesla_sequence(TIGNORE, __VA_ARGS__) -// This can be removed once all users are converted to the new syntax for calls. -#pragma clang diagnostic ignored "-Wunused" -#define called(...) __tesla_call(((void)__VA_ARGS__, __tesla_ignore)) +#define called(...) __tesla_call(((void)__VA_ARGS__, TIGNORE)) #define returned(...) __tesla_return(__VA_ARGS__) -#define callee(...) __tesla_callee(__tesla_ignore, __VA_ARGS__) -#define caller(...) __tesla_caller(__tesla_ignore, __VA_ARGS__) -#define strict(...) __tesla_strict(__tesla_ignore, __VA_ARGS__) -#define conditional(...) __tesla_conditional(__tesla_ignore, __VA_ARGS__) +#define callee(...) __tesla_callee(TIGNORE, __VA_ARGS__) +#define caller(...) __tesla_caller(TIGNORE, __VA_ARGS__) +#define strict(...) __tesla_strict(TIGNORE, __VA_ARGS__) +#define conditional(...) __tesla_conditional(TIGNORE, __VA_ARGS__) #define TESLA_NOW __tesla_now #define TESLA_STRUCT_AUTOMATON(...) __tesla_struct_usage(__VA_ARGS__) -#define automaton(name, ...) __tesla_automaton(name, __VA_ARGS__) +#define automaton(name, ...) __tesla_automaton(name, __VA_ARGS__) +#define tesla_done return (__tesla_automaton_done()) -#define tesla_done return (__tesla_automaton_done()) - -#define optional(...) __tesla_optional(__tesla_ignore, __VA_ARGS__) +#define optional(...) __tesla_optional(TIGNORE, __VA_ARGS__) #define ANY_REP INT_MAX #define REPEAT(m, n, ...) __tesla_repeat(m, n, __VA_ARGS__) #define UPTO(n, ...) __tesla_repeat(0, n, __VA_ARGS__)