Initial revision

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@122 72102866-910b-0410-8b05-ffd578937521

Source/MutableCString.m

@@ -0,0 +1,196 @@
+/* Implementation for GNU Objective-C MutableCString object
+   Copyright (C) 1993,1994 Free Software Foundation, Inc.
+
+   Written by:  R. Andrew McCallum <mccallum@gnu.ai.mit.edu>
+   Date: January 1995
+
+   This file is part of the GNU Objective C Class Library.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/ 
+
+#include <objects/String.h>
+#include <objects/IndexedCollection.h>
+#include <objects/IndexedCollectionPrivate.h>
+/* memcpy(), strlen(), strcmp() are gcc builtin's */
+
+typedef struct {
+  @defs(MutableCString)
+} MutableCStringStruct;
+
+static inline void
+stringIncrementCountAndMakeHoleAt(MutableCStringStruct *self, 
+				  unsigned index, unsigned size)
+{
+#ifndef STABLE_MEMCPY
+  {
+    int i;
+    for (i = self->_count; i >= index; i--)
+      self->_contents_chars[i+size] = self->_contents_chars[i];
+  }
+#else
+  memcpy(self->_contents_chars + index, 
+	 self->_contents_chars + index + size,
+	 self->_count - index);
+#endif /* STABLE_MEMCPY */
+  (self->_count) += size;
+}
+
+static inline void
+stringDecrementCountAndFillHoleAt(MutableCStringStruct *self, 
+				  unsigned index, unsigned size)
+{
+  (self->_count) -= size;
+#ifndef STABLE_MEMCPY
+  {
+    int i;
+    for (i = index; i <= self->_count; i++)
+      self->_contents_chars[i] = self->_contents_chars[i+size];
+  }
+#else
+  memcpy(self->_contents_chars + index + size,
+	 self->_contents_chars + index, 
+	 self->_count - index);
+#endif /* STABLE_MEMCPY */
+}
+
+@implementation MutableCString
+
+/* This is the designated initializer for this class */
+- initWithCapacity: (unsigned)capacity
+{
+  [super initWithType:@encode(char)];
+  _count = 0;
+  _capacity = capacity;
+  OBJC_MALLOC(_contents_chars, char, _capacity+1);
+  _contents_chars[0] = '\0';
+  return self;
+}
+
+/* xxx This should be made to return void, but we need to change
+   IndexedCollecting and its conformers */
+- removeRange: (IndexRange)range
+{
+  stringDecrementCountAndFillHoleAt((MutableCStringStruct*)self, 
+				    range.location, range.length);
+  return self;
+}
+
+- (void) insertString: (String*)string atIndex: (unsigned)index
+{
+  unsigned c = [string count];
+  if (_count + c >= _capacity)
+    {
+      _capacity = MAX(_capacity*2, _count+c);
+      OBJC_REALLOC(_contents_chars, char, _capacity);
+    }
+  stringIncrementCountAndMakeHoleAt((MutableCStringStruct*)self, index, c);
+  memcpy(_contents_chars + index, [string cString], c);
+  _contents_chars[_count] = '\0';
+}
+
+
+- (Class) classForConnectedCoder: aRmc
+{
+  /* Make sure that Connection's always send us bycopy,
+     i.e. as our own class, not a Proxy class. */
+  return [self class];
+}
+
+- (void) encodeWithCoder: aCoder
+{
+  [aCoder encodeValueOfType:@encode(unsigned) at:&_capacity
+	  withName:"String capacity"];
+  [aCoder encodeValueOfType:@encode(char*) at:&_contents_chars 
+	  withName:"String content_chars"];
+}
+
++ newWithCoder: aCoder
+{
+  MutableCString *n;
+  unsigned cap;
+  
+  [aCoder decodeValueOfType:@encode(unsigned) at:&cap withName:NULL];
+  n = [[MutableCString alloc] initWithCapacity:cap];
+  [aCoder decodeValueOfType:@encode(char*) at:&(n->_contents_chars)
+	  withName:NULL];
+  n->_count = strlen(n->_contents_chars);
+  n->_capacity = cap;
+  return n;
+}
+
+/* Empty copy must empty an allocCopy'ed version of self */
+- emptyCopy
+{
+  MutableCString *copy = [super emptyCopy];
+  OBJC_MALLOC(copy->_contents_chars, char, _count+1);
+  copy->_count = 0;
+  copy->_contents_chars[0] = '\0';
+  return copy;
+}
+
+- (const char *) cString
+{
+  return _contents_chars;
+}
+
+- (unsigned) count
+{
+  return _count;
+}
+
+- (char) charAtIndex: (unsigned)index
+{
+  CHECK_INDEX_RANGE_ERROR(index, _count);
+  return _contents_chars[index];
+}
+
+/* For IndexedCollecting protocol */
+
+- insertElement: (elt)newElement atIndex: (unsigned)index
+{
+  CHECK_INDEX_RANGE_ERROR(index, _count+1);
+  // one for the next char, one for the '\0';
+  if (_count+1 >= _capacity)
+    {
+      _capacity *= 2;
+      OBJC_REALLOC(_contents_chars, char, _capacity);
+    }
+  stringIncrementCountAndMakeHoleAt((MutableCStringStruct*)self, index, 1);
+  _contents_chars[index] = newElement.char_u;
+  _contents_chars[_count] = '\0';
+  return self;
+}
+
+- (elt) removeElementAtIndex: (unsigned)index
+{
+  elt ret;
+
+  CHECK_INDEX_RANGE_ERROR(index, _count);
+  ret = _contents_chars[index];
+  stringDecrementCountAndFillHoleAt((MutableCStringStruct*)self, index, 1);
+  _contents_chars[_count] = '\0';
+  return ret;
+}
+
+- (elt) elementAtIndex: (unsigned)index
+{
+  elt ret_elt;
+  CHECK_INDEX_RANGE_ERROR(index, _count);
+  ret_elt.char_u = _contents_chars[index];
+  return ret_elt;
+}
+
+@end

Source/MutableString.m

@@ -0,0 +1,99 @@
+/* Implementation for GNU Objective-C MutableString object
+   Copyright (C) 1993,1994 Free Software Foundation, Inc.
+
+   Written by:  R. Andrew McCallum <mccallum@gnu.ai.mit.edu>
+   Date: July 1994
+
+   This file is part of the GNU Objective C Class Library.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; if not, write to the Free
+   Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/ 
+
+#include <objects/String.h>
+#include <objects/IndexedCollectionPrivate.h>
+/* memcpy(), strlen(), strcmp() are gcc builtin's */
+#include <limits.h>
+
+@implementation MutableString
+
+/* This is the designated initializer */
+- initWithCapacity: (unsigned)capacity
+{
+  return [self notImplemented:_cmd];
+}
+
++ (MutableString*) stringWithCapacity: (unsigned)capacity
+{
+  MutableCString *n = [[MutableCString alloc] initWithCapacity:capacity];
+  return [n autorelease];
+}
+
+/* Subclasses need to implemented the next to methods */
+
+- removeRange: (IndexRange)range
+{
+  [self notImplemented:_cmd];
+  return self;
+}
+
+- (void) insertString: (String*)string atIndex: (unsigned)index
+{
+  [self notImplemented:_cmd];
+}
+
+- (void) setString: (String*)string
+{
+  [self replaceRange:(IndexRange){0,INT_MAX} withString:string];
+}
+
+- (void) appendString: (String*)string
+{
+  [self insertString:string atIndex:[self count]];
+}
+
+- (void) replaceRange: (IndexRange)range withString: (String*)string
+{
+  [self removeRange:range];
+  [self insertString:string atIndex:range.location];
+}
+
+// SETTING VALUES;
+
+- (void) setIntValue: (int)anInt
+{
+  [self setString:[String stringWithFormat:@"%d", anInt]];
+}
+
+- (void) setFloatValue: (float)aFloat
+{
+  [self setString:[String stringWithFormat:@"%f", aFloat]];
+}
+
+- (void) setDoubleValue: (double)aDouble
+{
+  [self setString:[String stringWithFormat:@"%f", aDouble]];
+}
+
+- (void) setCStringValue: (const char *)aCString
+{
+  [self setString:[String stringWithCString:aCString]];
+}
+
+- (void) setStringValue: (String*)aString
+{
+  [self setString:aString];
+}
+
+@end