From owner-p4-projects@FreeBSD.ORG  Thu Jul 18 16:03:13 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 11BD181E; Thu, 18 Jul 2013 16:03:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id C76B381C
 for <perforce@freebsd.org>; Thu, 18 Jul 2013 16:03:12 +0000 (UTC)
 (envelope-from jonathan@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 by mx1.freebsd.org (Postfix) with ESMTP id B7C8B83A
 for <perforce@freebsd.org>; Thu, 18 Jul 2013 16:03:12 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6IG3COo064103
 for <perforce@freebsd.org>; Thu, 18 Jul 2013 16:03:12 GMT
 (envelope-from jonathan@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6IG3CcK064100
 for perforce@freebsd.org; Thu, 18 Jul 2013 16:03:12 GMT
 (envelope-from jonathan@freebsd.org)
Date: Thu, 18 Jul 2013 16:03:12 GMT
Message-Id: <201307181603.r6IG3CcK064100@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jonathan@freebsd.org using -f
From: Jonathan Anderson <jonathan@FreeBSD.org>
Subject: PERFORCE change 231256 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Jul 2013 16:03:13 -0000

http://p4web.freebsd.org/@@231256?ac=10

Change 231256 by jonathan@jonathan-on-joe on 2013/07/18 16:02:36

	Rename TESLA_NOW to TESLA_ASSERTION_SITE.
	
	Pull in commit b0d631b from GitHub, which renames the 'now' event in a number of places.
	
	This isn't a very complicated change, but it does touch a lot of code.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla-macros.h#7 edit
.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla.h#5 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla-macros.h#7 (text+ko) ====

@@ -81,7 +81,7 @@
 #define	flags(...)		__tesla_flags(__VA_ARGS__)
 #define	bitmask(...)		__tesla_mask(__VA_ARGS__)
 
-#define	TESLA_NOW __tesla_now
+#define	TESLA_ASSERTION_SITE	__tesla_assertion_site
 
 
 #define	TESLA_STRUCT_AUTOMATON(...)	__tesla_struct_usage(__VA_ARGS__)
@@ -97,10 +97,10 @@
 #define	ANY(int_type)		__tesla_any(int_type)
 
 /** A more programmer-friendly way to write assertions about the past. */
-#define previously(...)    TSEQUENCE(__VA_ARGS__, TESLA_NOW)
+#define previously(...)    TSEQUENCE(__VA_ARGS__, TESLA_ASSERTION_SITE)
 
 /** A more programmer-friendly way to write assertions about the future. */
-#define eventually(...)    TSEQUENCE(TESLA_NOW, __VA_ARGS__)
+#define eventually(...)    TSEQUENCE(TESLA_ASSERTION_SITE, __VA_ARGS__)
 
 /** @} */
 

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/include/tesla.h#5 (text+ko) ====

@@ -128,7 +128,7 @@
 struct __tesla_event* __tesla_ignore;
 
 /** Reaching the inline assertion. */
-struct __tesla_event* __tesla_now;
+struct __tesla_event* __tesla_assertion_site;
 
 struct __tesla_event* __tesla_optional(__tesla_event*, ...);