From 3d5b9f16512b0403f2f08575e437905ea4ee91ef Mon Sep 17 00:00:00 2001
From: Jeremy Hughes <jedahu@gmail.com>
Date: Wed, 8 Jul 2009 17:35:17 +1200
Subject: [PATCH] alien.marshall.syntax: changed naming scheme

Prefixes:
     C-  generates inline C code
     M-  marshalls arguments and return values
    CM-  does both
---
 basis/alien/marshall/syntax/syntax-tests.factor | 4 ++--
 basis/alien/marshall/syntax/syntax.factor       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/basis/alien/marshall/syntax/syntax-tests.factor b/basis/alien/marshall/syntax/syntax-tests.factor
index 23d9a7372a..5b0a28f0e6 100644
--- a/basis/alien/marshall/syntax/syntax-tests.factor
+++ b/basis/alien/marshall/syntax/syntax-tests.factor
@@ -7,11 +7,11 @@ IN: alien.marshall.syntax.tests
 DELETE-C-LIBRARY: test
 C-LIBRARY: test
 
-C-MARSHALLED: void outarg1 ( int* a )
+CM-FUNCTION: void outarg1 ( int* a )
     *a += 2;
 ;
 
-C-MARSHALLED: unsigned-long* outarg2 ( unsigned-long a, unsigned-long* b )
+CM-FUNCTION: unsigned-long* outarg2 ( unsigned-long a, unsigned-long* b )
     unsigned long* x = (unsigned long*) malloc(sizeof(unsigned long));
     *b = 10 + *b;
     *x = a + *b;
diff --git a/basis/alien/marshall/syntax/syntax.factor b/basis/alien/marshall/syntax/syntax.factor
index 4453b1a405..e764ed2307 100644
--- a/basis/alien/marshall/syntax/syntax.factor
+++ b/basis/alien/marshall/syntax/syntax.factor
@@ -29,10 +29,10 @@ IN: alien.marshall.syntax
     [ in>> ] keep [ marshalled-function define-declared ] 3keep
     out>> c-function-string' c-strings get push ;
 
-SYNTAX: C-MARSHALLED:
+SYNTAX: CM-FUNCTION:
     function-types-effect define-c-marshalled ;
 
-SYNTAX: MARSHALLED:
+SYNTAX: M-FUNCTION:
     function-types-effect marshalled-function define-declared ;
 
 SYNTAX: M-STRUCTURE: