@@ -21,14 +21,14 @@ functions:(dict))) ;; for each function, remember its signature (global import - (macro _ + (macro-0 _ (NuBridgeSupport importFramework:((margs car) stringValue) fromPath:(if (margs cdr) (then (eval ((margs cdr) car))) (else nil)) intoDictionary:BridgeSupport))) (global import-system - (macro _ + (macro-0 _ (((NSString stringWithShellCommand:"ls /System/Library/Frameworks") lines) each: (do (line) (set name ((line componentsSeparatedByString:".") 0)) - (eval (cons 'import (list name))))))) \ No newline at end of file + (eval (cons 'import (list name))))))) nu/bridgesupport.nu @@ -17,7 +17,7 @@ ;; See the License for the specific language governing permissions and ;; limitations under the License. -(macro bridge +(macro-0 bridge (set __kind (margs first)) (set __name (margs second)) (set __signature (margs third)) nu/cocoa.nu @@ -178,7 +178,7 @@ (imethod (void) addClass: (id) class is (@classes addObject:class))) ;; Extract information from one line of class and method comments. -(macro parseClassAndMethodCommentLine +(macro-0 parseClassAndMethodCommentLine (cond ((line beginsWithString:"@class") (set @class (line substringFromIndex:(+ 1 ("@class" length))))) ((line beginsWithString:"@category") ;; category is an alias for class @@ -197,7 +197,7 @@ (@discussion appendString:line)))) ;; Extract documentation information from class and method comments. -(macro parseClassAndMethodComments +(macro-0 parseClassAndMethodComments (set @discussion (NSMutableString string)) (if @comments (if (set match (objc-comment-pattern findInString:@comments)) @@ -469,7 +469,7 @@ END)) (set $comments "#{(match groupAtIndex:0)}")) (else nil))))) -(macro site-header +(macro-0 site-header (if (eq $sitename "programming.nu") (then <<-END <div style="float:left; margin-right:10px"> @@ -790,7 +790,7 @@ END)) ;; ;; Main program starts here ;; -(macro nudoc +(macro-0 nudoc (set $classes (NSMutableDictionary dictionary)) (set $files (NSMutableDictionary dictionary)) nu/doc.nu @@ -28,27 +28,27 @@ (then (meval ((pairs cdr) cdr) (subst (pairs second) (pairs first) code))) (else (eval code)))) - (macro class-help-0 + (macro-0 class-help-0 (meval (list 'className (margs first) 'helpText (margs second)) '(class className (imethod (id) help is helpText)))) - (macro class-help-1 + (macro-0 class-help-1 (eval (list 'class (margs first) (list 'imethod '(id) 'help 'is (margs second))))) - (macro class-help-2 + (macro-0 class-help-2 (class (unquote (margs first)) (imethod (id) help is (unquote (margs second))))) ; we might prefer this when the parser can handle commas. - ;(macro class-help-3 + ;(macro-0 class-help-3 ; (class ,(margs first)) ; (imethod (id) help is ,(margs second))) ) -(macro class-help +(macro-0 class-help (class (unquote (margs first)) (imethod (id) help is (unquote (margs second))))) nu/help.nu @@ -77,7 +77,7 @@ ;; We just use an "_" for the macro name argument because its local name is unimportant. ;; It does not work with the latest (more restrictive) ObjC runtimes from Apple. (global protocol - (macro _ + (macro-0 _ (set __signatureForIdentifier (NuBridgedFunction functionWithName:"signature_for_identifier" signature:"@@@")) (function __parse_signature (typeSpecifier) (__signatureForIdentifier typeSpecifier (NuSymbolTable sharedSymbolTable))) nu/nu.nu @@ -101,7 +101,7 @@ (set $assertions (+ $assertions @assertions)) (puts "#{((self class) name)}: completed #{(testcases count)} tests/#{@assertions} assertions/#{@failures} failures/#{@errors} errors"))) -(macro assert_equal +(macro-0 assert_equal (set @assertions (+ @assertions 1)) (set __reference (eval (car margs))) (set __actual (eval (car (cdr margs)))) @@ -110,7 +110,7 @@ (set @failures (+ @failures 1))) nil) -(macro assert_not_equal +(macro-0 assert_not_equal (set @assertions (+ @assertions 1)) (set __reference (eval (car margs))) (set __actual (eval (car (cdr margs)))) @@ -119,7 +119,7 @@ (set @failures (+ @failures 1))) nil) -(macro assert_greater_than +(macro-0 assert_greater_than (set @assertions (+ @assertions 1)) (set __reference (eval (car margs))) (set __actual (eval (car (cdr margs)))) @@ -128,7 +128,7 @@ (set @failures (+ @failures 1))) nil) -(macro assert_less_than +(macro-0 assert_less_than (set @assertions (+ @assertions 1)) (set __reference (eval (car margs))) (set __actual (eval (car (cdr margs)))) @@ -137,7 +137,7 @@ (set @failures (+ @failures 1))) nil) -(macro assert_throws +(macro-0 assert_throws (set @assertions (+ @assertions 1)) (set __desired (eval (car margs))) (set __block (cdr margs)) @@ -155,7 +155,7 @@ (set @failures (+ @failures 1)))) nil) -(macro assert_in_delta +(macro-0 assert_in_delta (set @assertions (+ @assertions 1)) (set __reference (eval (car margs))) (set __actual (eval (car (cdr (margs))))) @@ -166,7 +166,7 @@ (set @failures (+ @failures 1))) nil) -(macro assert_true +(macro-0 assert_true (set @assertions (+ @assertions 1)) (set __actual (eval (car margs))) (unless __actual @@ -174,7 +174,7 @@ (set @failures (+ @failures 1))) nil) -(macro assert_false +(macro-0 assert_false (set @assertions (+ @assertions 1)) (set __actual (eval (car margs))) (if __actual nu/test.nu @@ -1874,6 +1874,7 @@ void load_builtins(NuSymbolTable *symbolTable) install("def", Nu_function_operator); install("function", Nu_function_operator); install("macro", Nu_macro_operator); + install("macro-0", Nu_macro_operator); install("progn", Nu_progn_operator); install("then", Nu_progn_operator); install("else", Nu_progn_operator); objc/operator.m @@ -133,11 +133,11 @@ (imethod (id) testLoopMacro is ;; here is a simple macro defining an unending loop - (macro loop (eval (append '(while t) margs))) + (macro-0 loop (eval (append '(while t) margs))) ;; here's a macro that decrements a named value - (macro decrement (set (unquote (margs car)) (- (unquote (margs car)) 1))) + (macro-0 decrement (set (unquote (margs car)) (- (unquote (margs car)) 1))) ;; here's a macro that increments a named value - (macro increment (set (unquote (margs car)) (+ (unquote (margs car)) 1))) + (macro-0 increment (set (unquote (margs car)) (+ (unquote (margs car)) 1))) ;; run the loop, breaking out after 5 iterations (set count 0) (set x 10) test/test_control.nu @@ -15,7 +15,7 @@ ;; recursive macro test case done wrong. ;; because x is not a gensym it keeps getting redefined in the recursive descent (imethod (id) testBrokenFactorialMacro is - (macro mfact + (macro-0 mfact (set x (eval (car margs))) (if (== x 0) (then 1) @@ -25,7 +25,7 @@ ;; recursive macro test case done right. ;; names prefixed with the "__" sigil are gensyms. (imethod (id) testFactorialMacro is - (macro mfact + (macro-0 mfact (set __x (eval (car margs))) (if (== __x 0) (then 1) @@ -34,7 +34,7 @@ ;; test string interpolation of gensyms (imethod (id) testGensymInterpolation is - (macro interpolateGensym + (macro-0 interpolateGensym (set __x 123) (set __y 456) "you got #{__x} and #{__y}") @@ -43,7 +43,7 @@ ;; test some macro implementation details (imethod (id) testMacroImplementation is (set s (NuSymbolTable sharedSymbolTable)) - (macro forty (set __x 22) (set __y (+ __x 18))) + (macro-0 forty (set __x 22) (set __y (+ __x 18))) (set newBody (send forty body:(send forty body) withGensymPrefix:"g999" symbolTable:s)) (assert_equal "((set g999__x 22) (set g999__y (+ g999__x 18)))" (newBody stringValue))) @@ -56,7 +56,7 @@ (newName appendString:":") newName) - (macro reader + (macro-0 reader (set __name ((car margs) stringValue)) (_class addInstanceVariable:__name signature:"@") @@ -64,7 +64,7 @@ signature:"@@:" body:(do () (self valueForIvar:__name)))) - (macro writer + (macro-0 writer (set __name ((car margs) stringValue)) (_class addInstanceVariable:__name signature:"@") @@ -72,7 +72,7 @@ signature:"v@:@" body:(do (new) (self setValue:new forIvar:__name)))) - (macro accessor + (macro-0 accessor (set __name ((car margs) stringValue)) (_class addInstanceVariable:__name signature:"@") test/test_macros.nu @@ -51,6 +51,7 @@ END))) '(("void" "v" 400) ("id" "@" 400) ("int" "i" 400) + ("BOOL" "C" 20) ("float" "f" 100) ("double" "d" 100) ("CGRect" "{_CGRect={_CGPoint=ff}{_CGSize=ff}}" 20) util/handlers.nu d0a07b287f316d60f94dfe87251469b7a6bea000 Tim Burks tim@neontology.com http://github.com/timburks/nu/commit/ab8b5d084d5219b32f7ac72707f61528c4f33771 ab8b5d084d5219b32f7ac72707f61528c4f33771 2008-08-04T09:39:33-07:00 2008-08-04T09:39:33-07:00 Added "macro-0" as an alias for the existing Nu macro operator. a3dc094bc63d6c433fc6c0915bd16bb7ce9e0d85 Tim Burks tim@neontology.com