Changeset 153 for trunk/Cocoa/F-Script Anywhere/Source/FSAViewAssociationController.m

Timestamp:

02/13/04 21:01:06 (20 years ago)

Author:

Nicholas Riley

Message:

Integrates SCPatch and mach_inject; unfinished, buggy.

File:

• trunk/Cocoa/F-Script Anywhere/Source/FSAViewAssociationController.m (modified) (6 diffs)

trunk/Cocoa/F-Script Anywhere/Source/FSAViewAssociationController.m

@@ -31 +31 @@
 #import <FScript/FSInterpreter.h>
 #import <FScript/System.h>
-
-// XXX workaround for lack of identifier validation; should go away when F-Script adds (promised) direct support for this
-@interface Compiler
-+ (BOOL)isValidIndentifier:(NSString *)str;
-@end
 
 @implementation FSAViewAssociationController
@@ -77 +72 @@
     [statusField setStringValue: @""];
     if ([variableName length] != 0) {
-        if (![Compiler isValidIndentifier: variableName]) {
+        if (![FSInterpreter validateSyntaxForIdentifier: variableName]) {
             [statusField setStringValue: @"Invalid name: contains spaces, punctuation or non-ASCII characters"];
         } else if (selectedElement != nil) {
@@ -102 +97 @@
 }
 
-- (void)_addElement:(id)element withLabel:(NSString *)label toSubmenuForItem:(NSMenuItem *)item;
+- (void)_addElement:(id)element withLabel:(NSString *)label toSubmenuForItem:(id<NSMenuItem>)item;
 {
     NSMenu *submenu = [item submenu];
-    NSMenuItem *subItem;
+    id<NSMenuItem> subItem;
     if (submenu == nil) {
         id superElement = [item representedObject];
@@ -127 +122 @@
 }
 
-- (void)_addValueForSelector:(SEL)sel withLabel:(NSString *)label toSubmenuForItem:(NSMenuItem *)item;
+- (void)_addValueForSelector:(SEL)sel withLabel:(NSString *)label toSubmenuForItem:(id<NSMenuItem>)item;
 {
     id obj = [item representedObject];
@@ -139 +134 @@
 - (void)_addElementToMenu:(id)element;
 {
-    NSMenuItem *item;
+    id<NSMenuItem> item;
     if (element == nil) return;
     item = [viewHierarchyMenu addItemWithTitle: [@"  "
@@ -271 +266 @@
 - (IBAction)defineVariable:(id)sender;
 {
-#warning this should change when F-Script supports a public API for identifier validation
     NS_DURING
         NSString *variableName = [variableNameField stringValue];