ObjFW  Diff

Differences From Artifact [ef5fe152e1]:

• File src/OFArray.m — part of check-in [eaa612ad50] at 2014-02-08 09:26:40 on branch trunk — Add -[JSONRepresentationWithOptions:]

  This also adds OF_JSON_REPRESENTATION_PRETTY. (user: js, size: 17739) [annotate] [blame] [check-ins using]

To Artifact [ff677666a5]:

• File src/OFArray.m — part of check-in [4e59d2692f] at 2014-04-26 00:40:17 on branch trunk — Fix a few issues on LLP64 and Win64

  LLP64 was mostly fast enumeration using an unsigned long for the state,
  which can't store a pointer or a size_t on LLP64. This is now solved by
  either throwing an OFOutOfRangeException if the value of the size_t is
  bigger than ULONG_MAX or storing the pointer in the extra field (copied
  using memcpy, as it's an array of unsigned long, which again would be
  too small to store a pointer).

  Win64 was mostly Microsoft not being able to decide whether a length is
  a size_t, a DWORD, an int or an unsigned int (thus the different types
  in places that seem to be almost the same). But since that would not be
  confusing enough, a file descriptor is an int if it's for a file, but a
  long long if it is for a socket. But of course, for ReadFile and friends
  it's a DWORD instead of an int then. (user: js, size: 17849) [annotate] [blame] [check-ins using]

738
739
740
741
742
743
744
745



746
747
748
749
750
751
752

	if (range.location + range.length > [self count])
		range.length = [self count] - range.location;

	[self getObjects: objects
		 inRange: range];

	state->state = range.location + range.length;



	state->itemsPtr = objects;
	state->mutationsPtr = (unsigned long*)self;

	return (int)range.length;
}

- (OFEnumerator*)objectEnumerator

|
>
>
>

738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755

	if (range.location + range.length > [self count])
		range.length = [self count] - range.location;

	[self getObjects: objects
		 inRange: range];

	if (range.location + range.length > ULONG_MAX)
		@throw [OFOutOfRangeException exception];

	state->state = (unsigned long)(range.location + range.length);
	state->itemsPtr = objects;
	state->mutationsPtr = (unsigned long*)self;

	return (int)range.length;
}

- (OFEnumerator*)objectEnumerator