Permalink
Browse files

Merge branch 'master' of https://github.com/andrewschleifer/nu

  • Loading branch information...
2 parents 7da8bf6 + 8c211aa commit 701a63f2698300da9d188c66d430fd1c175fe381 @timburks timburks committed Apr 2, 2013
Showing with 32 additions and 32 deletions.
  1. +4 −4 nu/cblocks.nu
  2. +9 −9 nu/doc.nu
  3. +2 −2 nu/generate.nu
  4. +10 −10 nu/help.nu
  5. +1 −1 nu/template.nu
  6. +4 −4 objc/Nu.h
  7. +1 −1 test/test_dictionary.nu
  8. +1 −1 tools/nubile
View
@@ -1,6 +1,6 @@
;; @file cblocks.nu
;; @discussion Macros for creating C/Objective-C blocks from Nu
-;;
+;;
;;
;; @copyright Copyright (c) 2007 Tim Burks, Radtastical Inc.
;;
@@ -25,16 +25,16 @@
(macro bridgedblock (ret params *body)
(progn
; Bail if blocks aren't enabled in the framework
- (try ((NuBridgedBlock class))
+ (try ((NuBridgedBlock class))
(catch (execption) (throw* "NuException" "This build of Nu does not support C blocks.")))
(set __sig (signature (list ret)))
(set __blockparams ())
(set __paramlist params)
(until (eq __paramlist nil)
(set __type (car __paramlist))
- (if (eq (cdr __paramlist) nil)
- (throw* "NuMatchException"
+ (if (eq (cdr __paramlist) nil)
+ (throw* "NuMatchException"
"cblock parameter list must contain an even number of elements in the form \"(type) name\""))
(set __param (car (cdr __paramlist)))
(set __paramlist (cdr (cdr __paramlist)))
View
@@ -562,21 +562,21 @@ END))
;;;;;;;;;;;;; Stylesheet Template ;;;;;;;;;;;;;;;;;
(set css-template (NuTemplate codeForString: <<-END
body {
- margin: 0;
- padding: 0;
+ margin: 0;
+ padding: 0;
font: normal 14px "lucida grande", verdana, arial, helvetica, sans-serif;
line-height: 150%;
}
#container {
width: 800px;
- margin: 10px auto;
+ margin: 10px auto;
padding: 0;
}
#header {
width: 750px;
- margin: 0;
+ margin: 0;
padding: 0px 25px 0px 25px;
}
@@ -596,19 +596,19 @@ body {
padding-right:20px;
padding-left:20px;
line-height: 130%;
- font-size: 90%;
+ font-size: 90%;
}
code {
- font-size: 12px;
+ font-size: 12px;
}
-a:link, a:visited {
+a:link, a:visited {
color: #101010;
text-decoration: none;
}
-a:hover, a:active {
+a:hover, a:active {
color: #505050;
text-decoration: underline;
}
@@ -690,7 +690,7 @@ END))
<a name="<%= (methodInfo shortMethodName) %>">
<%= (methodInfo tableDescription) %>
</a>
-<%= (methodInfo discussion) %>
+<%= (methodInfo discussion) %>
<p align="right" style="margin-bottom:0">in <%= ((methodInfo file) linkWithPrefix:"../files/") %></p>
</div>
<% )) %>
View
@@ -128,7 +128,7 @@ END)
(result appendString:<<-END
@end
-END)
+END)
)))
result)
@@ -141,7 +141,7 @@ END)
(if (eq (car declaration) 'class)
;; open the class implementation
(result appendString:<<-END
-@implementation #{(declaration second)}
+@implementation #{(declaration second)}
END)
View
@@ -29,7 +29,7 @@ This operator gets the head of a list.END)
This operator gets the rest of a list, excluding its head.END)
(class-help Nu_atom_operator <<-END
-This operator tests whether an object is an atom.
+This operator tests whether an object is an atom.
In Nu, lists and nil are not atoms.
Everything else is an atom.END)
@@ -47,8 +47,8 @@ The second element should be another list or nil.END)
This operator appends two lists together.END)
(class-help Nu_cond_operator <<-END
-This operator scans through a list of lists, evaluating the
-first member of each list. When one evaluates true, the
+This operator scans through a list of lists, evaluating the
+first member of each list. When one evaluates true, the
remainder of that list is evaluated and the result of the
last evaluation is returned. If none evaluate true, the
last list in the list of lists is evaluated.END)
@@ -153,7 +153,7 @@ context. It expects three arguments: the function name,
a list of function parameters, and the body of the function.END)
(class-help Nu_macro_1_operator <<-END
-This operator creates a named macro in the current evaluation
+This operator creates a named macro in the current evaluation
context. It expects two arguments: the macro name, followed by
the body of the macro.END)
@@ -167,7 +167,7 @@ This operator constructs a list from its arguments.END)
(class-help Nu_do_operator <<-END
This operator is used to create blocks.
-For example, the following expression creates a
+For example, the following expression creates a
block that returns the sum of its two arguments:
(do (x y)
(+ x y))
@@ -187,8 +187,8 @@ This operator loads a file or bundle.END)
(class-help Nu_class_operator <<-END
This operator defines or extends a class.
If a subclass is specified, presumably a new
-class is to be created. Subsequent lists
-within the operator may be used to add
+class is to be created. Subsequent lists
+within the operator may be used to add
instance methods, class methods, and instance
variables to the class.END)
@@ -216,13 +216,13 @@ created.END)
This operator sends a message to an object. Normally
it is not needed, but for a few kinds of objects,
such as blocks, functions, and macros, the normal
-list syntax for message sending is treated as a
-call. This operator was added to allow messages
+list syntax for message sending is treated as a
+call. This operator was added to allow messages
to be sent to these objects.END)
(class-help Nu_let_operator <<-END
This operator performs bindings specified in a list
-of name-value pairs, then evaluates a sequence of
+of name-value pairs, then evaluates a sequence of
expressions in the specified binding.END)
(class-help Nu_help_operator <<-END
View
@@ -97,7 +97,7 @@ END-TEMPLATE))
;; This script can be evaluated to produce the desired output text.
(set script "")
(script appendString:<<-END-TEMPLATE
-(let (#{resultName} "")
+(let (#{resultName} "")
(#{resultName} appendString:<<-#{tagName}
END-TEMPLATE)
(script appendString: text)
View
@@ -244,7 +244,7 @@
The Nu <b>macro</b> operator uses blocks to create macros.
Since macros evaluate in their callers' contexts, no context information is kept for blocks used to create macros.
- When used in a class context, the <b>-</b> and <b>+</b> operators
+ When used in a class context, the <b>-</b> and <b>+</b> operators
use blocks to create new method implementations.
When a block is called as a method implementation, its context includes the symbols
<b>self</b> and <b>super</b>. This allows method implementations to send messages to
@@ -679,7 +679,7 @@
@abstract A reader for Apple's BridgeSupport files.
@discussion Methods of this class are used to read Apple's BridgeSupport files.
*/
-@interface NuBridgeSupport : NSObject
+@interface NuBridgeSupport : NSObject
/*! Import a dynamic library at the specified path. */
+ (void)importLibrary:(NSString *) libraryPath;
/*! Import a BridgeSupport description of a framework from a specified path. Store the results in the specified dictionary. */
@@ -1107,7 +1107,7 @@
// Let's make NSRegularExpression and NSTextCheckingResult look like our previous classes, NuRegex and NuRegexMatch
-@interface NSTextCheckingResult (NuRegexMatch)
+@interface NSTextCheckingResult (NuRegexMatch)
/*!
@method regex
The regular expression used to make this match. */
@@ -1135,7 +1135,7 @@
@end
-@interface NSRegularExpression (NuRegex)
+@interface NSRegularExpression (NuRegex)
/*!
@method regexWithPattern:
View
@@ -51,7 +51,7 @@
(set count (+ count 1))))
(assert_equal (- (d count) 1) count))
- (- (id) testMap is
+ (- (id) testMap is
(set d (dict one:1 two:2 three:3 four:4))
(set o (d map:(do (k v) (+ 1 v))))
(assert_equal (d count) (o count))
View
@@ -1,4 +1,4 @@
-#!/usr/local/bin/nush
+#!/usr/bin/env nush
#
# @file nubile
# The Nu code beautification tool.

0 comments on commit 701a63f

Please sign in to comment.