[48438] users/toby/objcports
toby at macports.org
toby at macports.org
Sat Mar 21 22:25:14 PDT 2009
Revision: 48438
http://trac.macports.org/changeset/48438
Author: toby at macports.org
Date: 2009-03-21 22:25:13 -0700 (Sat, 21 Mar 2009)
Log Message:
-----------
more cleanup
Modified Paths:
--------------
users/toby/objcports/MPParser.h
users/toby/objcports/MPParser.m
users/toby/objcports/MPPort.h
users/toby/objcports/MPPort.m
Modified: users/toby/objcports/MPParser.h
===================================================================
--- users/toby/objcports/MPParser.h 2009-03-22 02:22:19 UTC (rev 48437)
+++ users/toby/objcports/MPParser.h 2009-03-22 05:25:13 UTC (rev 48438)
@@ -5,14 +5,6 @@
MPPort *_port;
Tcl_Interp *_interp;
- // set before parsing (list obtained elsewhere...)
- // actual values are stored inside the interpreter for now
- NSMutableArray *_options;
-
- // also set before parsing, from external list
- // remember that not every subcommand should be a target :)
- NSMutableArray *_targets;
-
// information gathered during parsing, not stored in interpreter
NSMutableDictionary *_variants;
NSMutableArray *_platforms; // just a list, for dupe checking
@@ -20,7 +12,6 @@
- (id)initWithPort:(MPPort *)port;
-- (NSString *)option:(NSString *)option;
- (NSArray *)variants;
- (NSArray *)platforms;
Modified: users/toby/objcports/MPParser.m
===================================================================
--- users/toby/objcports/MPParser.m 2009-03-22 02:22:19 UTC (rev 48437)
+++ users/toby/objcports/MPParser.m 2009-03-22 05:25:13 UTC (rev 48438)
@@ -6,10 +6,11 @@
#include "MPArrayAdditions.h"
#include "MPStringAdditions.h"
+static char *variable_read(ClientData clientData, Tcl_Interp *interp, const char *name1, const char *name2, int flags);
+static int unknown_trampoline(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
+
static int _nslog(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
-static int _unknown(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]);
-static char *_variable(ClientData clientData, Tcl_Interp *interp, const char *name1, const char *name2, int flags);
-static void info(Tcl_Interp *interp, const char *command); // debugging
+static void _info(Tcl_Interp *interp, const char *command); // debugging
@implementation MPParser
@@ -28,17 +29,17 @@
Tcl_Preserve(_interp);
for (NSString *var in [_port variables]) {
- Tcl_TraceVar(_interp, [var UTF8String], TCL_TRACE_READS, _variable, port);
+ Tcl_TraceVar(_interp, [var UTF8String], TCL_TRACE_READS, variable_read, port);
}
Tcl_CreateObjCommand(_interp, "nslog", _nslog, NULL, NULL);
/* Handle *all* commands via the "unknown" mechanism. */
- Tcl_CreateObjCommand(_interp, "unknown", _unknown, self, NULL);
+ Tcl_CreateObjCommand(_interp, "unknown", unknown_trampoline, self, NULL);
- NSString *portfile = [_port portfile];
- if (Tcl_EvalFile(_interp, [portfile UTF8String]) != TCL_OK) {
- NSLog(@"Tcl_EvalFile(%@): %s", portfile, Tcl_GetStringResult(_interp));
+ const char *portfile = [[_port portfile] UTF8String];
+ if (Tcl_EvalFile(_interp, portfile) != TCL_OK) {
+ NSLog(@"Tcl_EvalFile(%s): %s", portfile, Tcl_GetStringResult(_interp));
}
Tcl_Release(_interp);
@@ -49,8 +50,8 @@
self = nil;
}
@finally {
- info(_interp, "[info globals]");
- info(_interp, "[info commands]");
+ _info(_interp, "[info globals]");
+ _info(_interp, "[info commands]");
//NSLog(@"%@", _variants);
}
@@ -66,12 +67,6 @@
[super dealloc];
}
-- (NSString *)option:(NSString *)option
-{
- const char *val = Tcl_GetVar(_interp, [option UTF8String], 0);
- return val ? [NSString stringWithUTF8String:val] : nil;
-}
-
- (NSArray *)variants
{
return [_variants allKeys];
@@ -147,8 +142,6 @@
if (YES) {
Tcl_Eval(_interp, [[args lastObject] UTF8String]);
}
- } else if ([[_port procs] containsObject:command]) {
- // callback somewhere...
} else if ([_port isTarget:command]) {
// XXX: store for later use...
} else {
@@ -164,17 +157,8 @@
@end
-static int _nslog(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
-{
- NSArray *args = [[NSArray alloc] initWithTclObjects:++objv count:--objc];
- NSLog(@"%@", [args componentsJoinedByString:@" "]);
- [args release];
-
- return TCL_OK;
-}
-
static int
-_unknown(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+unknown_trampoline(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
{
assert(objc >= 2);
assert(!strcmp(Tcl_GetString(objv[0]), "::unknown"));
@@ -187,15 +171,25 @@
}
static char *
-_variable(ClientData clientData, Tcl_Interp *interp, const char *name1, const char *name2, int flags)
+variable_read(ClientData clientData, Tcl_Interp *interp, const char *name1, const char *name2, int flags)
{
Tcl_SetVar2Ex(interp, name1, name2, Tcl_SubstObj(interp, Tcl_NewStringObj([[(id)clientData variable:[NSString stringWithUTF8String:name1]] UTF8String], -1), TCL_SUBST_ALL), 0);
return NULL;
}
// debugging
+static int
+_nslog(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
+{
+ NSArray *args = [[NSArray alloc] initWithTclObjects:++objv count:--objc];
+ NSLog(@"%@", [args componentsJoinedByString:@" "]);
+ [args release];
+
+ return TCL_OK;
+}
+
static void
-info(Tcl_Interp *interp, const char *command)
+_info(Tcl_Interp *interp, const char *command)
{
Tcl_Obj *result;
int objc;
Modified: users/toby/objcports/MPPort.h
===================================================================
--- users/toby/objcports/MPPort.h 2009-03-22 02:22:19 UTC (rev 48437)
+++ users/toby/objcports/MPPort.h 2009-03-22 05:25:13 UTC (rev 48438)
@@ -5,8 +5,6 @@
NSString *_portfile;
MPParser *_parser;
- NSMutableArray *_procs;
-
NSMutableArray *_targets;
NSMutableArray *_commands;
@@ -19,8 +17,6 @@
- (NSString *)portfile;
-- (NSArray *)procs;
-
- (BOOL)isTarget:(NSString *)target;
- (NSArray *)variables;
Modified: users/toby/objcports/MPPort.m
===================================================================
--- users/toby/objcports/MPPort.m 2009-03-22 02:22:19 UTC (rev 48437)
+++ users/toby/objcports/MPPort.m 2009-03-22 05:25:13 UTC (rev 48438)
@@ -11,10 +11,6 @@
self = [super init];
_portfile = [portfile retain];
- _procs = [[NSMutableArray alloc] initWithCapacity:0];
- [_procs addObject:@"variant_isset"];
- [_procs addObject:@"strsed"];
-
_targets = [[NSMutableArray alloc] initWithCapacity:0];
[_targets addObject:@"fetch"];
[_targets addObject:@"extract"];
@@ -150,7 +146,6 @@
[_parser release];
[_portfile release];
- [_procs release];
[_targets release];
[_commands release];
[_options release];
@@ -164,11 +159,6 @@
return _portfile;
}
-- (NSArray *)procs
-{
- return _procs;
-}
-
- (BOOL)isTarget:(NSString *)target
{
if ([target hasPrefix:@"pre-"]) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090321/2903a17a/attachment.html>
More information about the macports-changes
mailing list