Commits

Michael Tindal  committed 19005e7

Remove extra includes, change test to reflect parser changes.

  • Participants
  • Parent commits 01442a8

Comments (0)

Files changed (26)

File Classes/Core/NSObject+AssociatedObjects.h

 //  Public domain because I love you.
 //
 
-#import <Cocoa/Cocoa.h>
-
 @interface NSObject (AMAssociatedObjects)
 - (void)associateValue:(id)value withKey:(void *)key; // Strong reference
 - (void)weaklyAssociateValue:(id)value withKey:(void *)key;

File Classes/Core/SVBridgeSupport.h

    See the License for the specific language governing permissions and
    limitations under the License.
  */
-#import <Cocoa/Cocoa.h>
 #import <objc/runtime.h>
 #import <ffi/ffi.h>
 #import "SVFunction.h"

File Classes/Core/SVExceptionSystem.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVBlock.h"
 
 @interface SVCatchBlock : SVBlock {

File Classes/Core/SVFlowBlock.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVBlock.h"
 
 @interface SVFlowBlock : SVBlock {

File Classes/Core/SVFunction.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVBlock.h"
 
 #define SV_IN_FUNCTION_KEY @"__sv_running_inside_function" // should only be set on a context during -[SVFunction evaluateWithContext:]

File Classes/Core/SVNode.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
-
 @interface NSObject (SVevaluateWithContext)
 
 - (id) evaluateNode;

File Classes/Core/SVVariable.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVNode.h"
 
 @interface SVVariable : SVNode {

File Classes/Core/SVVariableAssignment.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVNode.h"
 
 @interface SVVariableAssignment : SVNode {

File Classes/Extensions/NSMutableArray+SVAdditions.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVNode.h"
 
 @class SVFunction;

File Classes/Extensions/NSMutableDictionary+SVExtensions.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVNode.h"
 #import "SVSymbolTable.h"
 

File Classes/Extensions/SVObjcExtensions.h

 - (NSString *) typeString;
 @end
 
-#import <Cocoa/Cocoa.h>
-
-
 @interface SVObjcExtensions : NSObject {
     @private
 }

File Classes/Operators/SVBinaryOperator.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVOperator.h"
 
 @interface SVBinaryOperator : SVOperator {

File Classes/Operators/SVControlOperations.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVNode.h"
 
 // Class used to handle 'break' statements.

File Classes/Operators/SVOperator.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVNode.h"
 
 @interface SVOperator : SVNode {

File Classes/Operators/SVUnaryOperator.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVOperator.h"
 
 @interface SVUnaryOperator : SVOperator {

File Classes/Parser/SVParserContext.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVNode.h"
 
 @interface SVParserContext : NSObject {

File Classes/Parser/SVSymbol.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
-
-
 @interface SVSymbol : NSObject <NSCoding> {
     @public
     NSString * name_;

File Classes/Parser/SVSymbolTable.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVSymbol.h"
 
 @interface SVSymbolTable : NSObject <NSCopying> {

File Classes/Types/SVCategory.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVNode.h"
 
 @interface SVCategory : SVNode {

File Classes/Types/SVClass.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVNode.h"
 
 @interface NSObject (SVDynIvarExtension)

File Classes/Types/SVClassWrapper.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVNode.h"
 #import "SVSymbolTable.h"
 

File Classes/Types/SVInstanceRef.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVNode.h"
 
 @interface SVInstanceRef : SVNode {

File Classes/Types/SVObjcBridgeTypes.h

 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
-#import <Cocoa/Cocoa.h>
 #import "SVNode.h"
 
 @interface SVObjCBridgeType : NSObject

File Classes/Types/core/SVRegex.h

 // Created by Satoshi Nakagawa.
 // You can redistribute it and/or modify it under the new BSD license.
 
-#import <Foundation/Foundation.h>
 #import "oniguruma.h"
 #import "SVRegexUtility.h"
 
-
 @class SVRegexResult;
 
 typedef enum {

File Classes/Types/core/SVRegexUtility.h

 // Created by Satoshi Nakagawa.
 // You can redistribute it and/or modify it under the new BSD license.
 
-#import <Foundation/Foundation.h>
 #import "oniguruma.h"
 #import "SVRegex.h"
 
-
 @class SVRegex;
 @class SVRegexResult;
 

File Tests/SVFunctionTests.m

 
 -(void) testHashDoFunction {
     NSString* expect = @"Hello world!";
-    PC(@"def func(d) { for(k in d.allKeys) { yield k,d[k]; }; return str; }; str = ''; func({:Hello => 'world!'}) { |k,v| str << k << ' ' << v; }; str;");
+    PC(@"def func(d) { for(k in d.allKeys) { yield k,d[k]; }; return str; }; str = ''; func(:Hello => 'world!') { |k,v| str << k << ' ' << v; }; str;");
     P(var);
     assertThat(var,is(equalTo(expect)));
 }