Squeak-dev February 2018

squeak-dev@lists.squeakfoundation.org

51 participants
149 discussions

The Trunk: Squeak-Version-cbc.5132.mcz
by commits＠source.squeak.org 13 Feb '18

13 Feb '18

Chris Cunningham uploaded a new version of Squeak-Version to project The Trunk: http://source.squeak.org/trunk/Squeak-Version-cbc.5132.mcz ==================== Summary ==================== Name: Squeak-Version-cbc.5132 Author: cbc Time: 25 January 2018, 1:22:39.044095 pm UUID: 9d1afcba-a654-d04d-b823-7a1487ee0c78 Ancestors: Squeak-Version-mt.5131 Add class SqueakVersion to hold documentation about this package - how to use, why to use. Also, remove previous preamble/postscript, since they are forced in a load prior to this one. Finally, added to postscript the removal of the packages (Exceptions, FlexibleVocabularies, ScriptLoader) from the image. =============== Diff against Squeak-Version-mt.5131 =============== Item was removed: - (PackageInfo named: 'Squeak-Version') preamble: '"This is a hack to finalize #MethodContext -> Context renaming. - The #bootstrapContext left two problems: - 1) there is a binding #MethodContext => Context. - 2) ContextPart still think it has Context as subclass, though this one changed its superclass. - We must make sure that the removal of these class won''t destroy Context." - - Smalltalk globals unbind: #MethodContext. - [Undeclared at: #MethodContext put: Context copy] on: AttemptToWriteReadOnlyGlobal do: [:exc | exc resume: true]. - - ContextPart ifNil: [^self]. - ContextPart isBehavior ifFalse: [^self]. - ContextPart instVarAt: 6 put: (ContextPart subclasses select: [:e | e superclass = ContextPart]) - '! Item was added: + SystemOrganization addCategory: #'Squeak-Version'! Item was added: + Object subclass: #SqueakVersion + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Squeak-Version'! + + !SqueakVersion commentStamp: 'cbc 1/25/2018 11:57' prior: 0! + This class exists soley as a description of this package, and how it should be used. + + When a package is removed from the trunk update process, you will need to increase the version number of the Squeak-Version package (this one) by the version number of the package removed + 1. This ensures that the trunk build number keeps increasing. + + An example: + When you unload a package, let's say Universes-mt.48, you add 49 (48 + 1) to the version number of Squeak-Version and save it. + Additionally, add in the package postscript the code to actually unload the package from the image as well: + ---------- package postscript ---------- + (MCPackage named: 'Universes') unload. + + Why is this important? + + The Squeak Trunk update (build) number (or Squeak "version") is thesum of versions of all the base packages. + This works great as long as we update packages and occassionally add new packages to Trunk. + However, when we remove packages from the base system, we must bump Squeak-Version's version by the removed package's version number, so that the aggregate version number doesn't decrease. + + In addition, folks have started to use the postscript of this package to actually remove the packages from the image that are removed from the Trunk updating process. This is especially useful if the package is empty before it was removed - then it removes cruft from users images. + ! Item was changed: + (PackageInfo named: 'Squeak-Version') postscript: '#( ''Exceptions'' ''FlexibleVocabularies'' ''ScriptLoader'' ) do: [:package| + (MCPackage named: package) workingCopy unload. + (MCPackage named: package) workingCopy unregister. + ].'! - (PackageInfo named: 'Squeak-Version') postscript: '(MCPackage named: ''311Deprecated'') unload. - (MCPackage named: ''SmallLand-ColorTheme'') unload.'!

5 5

[ReviewRequest] Error-handling and use of `future`
by Tony Garnock-Jones 13 Feb '18

13 Feb '18

Hi all, At the moment, if I printIt (1 future / 0) this results in a Promise, as expected. Separately, when the UI process next runs (almost immediately), it ends up signalling ZeroDivide, causing a debugger to open. It does not either resolve or reject the promise. The promise remains pending forever, when it should be rejected. The attached changeset is small and simple, and fixes this problem. It spans several packages - Morphic, System, Kernel and KernelTest - which is why it's a changeset and not a bunch of submissions to the inbox. If people could take a look over it, that'd be great! If the consensus is that the change is an improvement, I'll commit to MC and update trunk. I have specific questions: 1. How should unhandled errors by `future` sends be treated? The current code, and the code after the attached changeset, always opens a debugger. Would it be better to *not* open a debugger, instead relying on the user of the Promise to care about #whenRejected:? I cautiously suggest this might be the case. (Concretely, in the language of the changeset, all that would change is that `true` in Promise>>fulfillWith: would become `false`.) 2. What code is using `future`? Where can I find some examples of code that (isn't already broken and that) might break if I change the way `future` works? It seems like `future` is not widely used at all. If this is the case, perhaps we might be free to improve it. 3. How can we properly test errors signalled by a future send, if it pops up a debugger that we can't suppress? See the changeset's PromiseTest>>testFutureRejection, which currently has to be an expectedFailure for this reason. Tony

2 3

The Trunk: Chronology-Core-mt.11.mcz
by commits＠source.squeak.org 13 Feb '18

13 Feb '18

Marcel Taeumel uploaded a new version of Chronology-Core to project The Trunk: http://source.squeak.org/trunk/Chronology-Core-mt.11.mcz ==================== Summary ==================== Name: Chronology-Core-mt.11 Author: mt Time: 13 February 2018, 2:46:50.516993 pm UUID: 60f877b7-27a3-44a5-8220-483429ebb9db Ancestors: Chronology-Core-ul.10 Add a convenience message to wait on a duration. It is shorter than using Delay class >> #forDuration:. =============== Diff against Chronology-Core-ul.10 =============== Item was added: + ----- Method: Duration>>wait (in category 'squeak protocol') ----- + wait + "Convert this duration in a delay and wait once. Return the created delay so that the client can wait on it again if needed. + + Do-it: 3 minutes wait" + + | delay | + delay := self asDelay. + delay wait. + ^ delay!

1 0

Instructions for how to remove packages from trunk
by Chris Cunningham 13 Feb '18

13 Feb '18

Hi. I promised earlier this week to document how to remove a package from trunk. ----- To remove a package from trunk: 1. First, do NOT delete the package from source.squeak.org! Leave it in for older images. 2. Note the version of the package to be removed. 3. Edit the Squeak-Version package, altering the postscript to remove the package (MCPackage named: 'Universes') unload. You get to the postscript by pressing the 'Scripts' button in the Monticello Browser when the package is selected. 4. Save the Squeak-Version package to trunk with a version that is increased by the removed package version (step 2 above) + 1 for this bump. This keeps the trunk version number correctly increasinglike it should. 5. Update the trunk update config with the latest version of packages - and REMOVE the package from the config that should no longer be in trunk. Save this update. 6. Test it with a new image to verify everything worked correctly. ----- Comments are welcome. If no comments/correction, could this be added to the page http://squeak.org/development_process/ to increase the dev process documentation? Thanks, cbc

2 1

Another version of JSON in the Inbox
by Levente Uzonyi 13 Feb '18

13 Feb '18

Hi Tony, Hi All, Not too long ago I mentioned that we have forked the JSON package[1]. Recently I spent some time merging the two branches, and today I have uploaded the result to the Inbox[2], so that the diff tool could show what we changed in our branch. There are quite a few differences under the hood, so I would like to know what you think about our changes. Levente [1] http://lists.squeakfoundation.org/pipermail/squeak-dev/2016-August/191322.h… [2] http://lists.squeakfoundation.org/pipermail/squeak-dev/2018-February/197349…

2 1

https
by Eliot Miranda 12 Feb '18

12 Feb '18

Hi All, what are people using for https support? _,,,^..^,,,_ best, Eliot

6 23

The Trunk: Morphic-mt.1394.mcz
by commits＠source.squeak.org 12 Feb '18

12 Feb '18

Marcel Taeumel uploaded a new version of Morphic to project The Trunk: http://source.squeak.org/trunk/Morphic-mt.1394.mcz ==================== Summary ==================== Name: Morphic-mt.1394 Author: mt Time: 12 February 2018, 9:49:02.68787 am UUID: 2c7b52d0-710f-40e5-817b-d79218563652 Ancestors: Morphic-ul.1393 Small fix for mouse cursor in dialog boxes. =============== Diff against Morphic-ul.1393 =============== Item was changed: ----- Method: DialogWindow>>getUserResponse (in category 'running') ----- getUserResponse | hand world | (ProvideAnswerNotification signal: self message asString) ifNotNil: [:answer| ^ answer = #default ifTrue: [result] ifFalse: [answer]]. self message ifEmpty: [messageMorph delete]. "Do not waste space." self paneMorph submorphs ifEmpty: [self paneMorph delete]. "Do not waste space." hand := self currentHand. world := self currentWorld. self fullBounds. self center: preferredPosition. self bounds: (self bounds translatedToBeWithin: world bounds). self openInWorld: world. + hand showTemporaryCursor: nil. "Since we are out of context, reset the cursor." + hand keyboardFocus in: [:priorKeyboardFocus | self exclusive ifTrue: [hand newMouseFocus: self]. hand newKeyboardFocus: self. [self isInWorld] whileTrue:[world doOneSubCycle]. hand newKeyboardFocus: priorKeyboardFocus. hand releaseMouseFocus]. ^ result!

1 0

The Inbox: JSON-ul.47.mcz
by commits＠source.squeak.org 11 Feb '18

11 Feb '18

Levente Uzonyi uploaded a new version of JSON to project The Inbox: http://source.squeak.org/inbox/JSON-ul.47.mcz ==================== Summary ==================== Name: JSON-ul.47 Author: ul Time: 22 January 2018, 12:32:52.716166 am UUID: f2d44ea2-c2a1-4da0-9dec-5a3b1823ab3b Ancestors: JSON-ul.46, JSON-klub.46 - merged with JSON-klub.46 - ScaledDecimal>>jsonWriteOn: rounds the number instead of truncating it =============== Diff against JSON-tonyg.39 =============== Item was changed: Object subclass: #Json + instanceVariableNames: 'stream currentCharacter arrayBufferStream stringBufferStream numberParser ctorMap' - instanceVariableNames: 'stream ctorMap' classVariableNames: '' poolDictionaries: '' category: 'JSON'! Json class + instanceVariableNames: 'escapeArray escapeSet'! - instanceVariableNames: 'escapeArray'! + !Json commentStamp: 'ul 3/29/2016 04:38' prior: 0! + I support reading and writing JSON (see http://json.org) formatted data - strings, numbers, boolean, nil, arrays and dictionaries. + The implementation is mainly based on RFC 7159 (https://www.ietf.org/rfc/rfc7159.txt). It has been extended with syntax for invoking a prearranged list of constructors on read objects. + Character encoding is not handled here. That's something you have to do before reading or after writing. Mixed processing is possible, but it's entirely your responsibility to keep things correct. + + Instance Variables + stream: <PositionableStream> + currentCharacter: <Character> + arrayBufferStream: <WriteStream> + stringBufferStream: <ReadWriteStream> + numberParser: <ExtendedNumberParser> + ctorMap: <Dictionary> + + For parsing, stream has to be initialized by sending #readFrom: to my instance. The parser will pre-read one character, which will be stored in currentCharacter, so the stream is expected to support position manipulation, hence it should be a PositionableStream. + arrayBufferStream is WriteStream on an Array, which holds the values during array parsing (see #readArray). When there's a recursive call, this stream is used as a stack to separate the elements parsed in the previous invocation from the current one. + stringBufferStream is a ReadWriteStream on a String, which holds the currently parsed String (see #readString), the currently parsed number (see #readNumber) or the name of the currently parsed constructor (see #readConstructor). Recursion has no effect on this. + numberParser is a cached instance of ExtendedNumberParser. It's initialized on stringBufferStream, so it can quickly parse the number stored in it. + ctorMap is the Dictionary holding the constructor classes by name. + + arrayBufferStream, stringBufferStream and numberParser are initialized lazily, and should not be accessed externally. Since these are shared objects, along with stream and currentCharacter, holding state, therefore a single instance of me shouldn't be used to parse multiple streams at the same time. + + For writing, you can use the methods in the class-side rendering category. To convert individual objects to a string, you can use #asJsonString, to serialize it on a stream, you can use #jsonWriteOn:. + ! - !Json commentStamp: '<historical>' prior: 0! - This class reads and writes JSON format data - strings, numbers, boolean, nil, arrays and dictionaries. See http://www.crockford.com/JSON/index.html. It has been extended with syntax for invoking a prearranged list of constructors on read objects.! Json class + instanceVariableNames: 'escapeArray escapeSet'! - instanceVariableNames: 'escapeArray'! Item was changed: + ----- Method: Json class>>escapeForCharacter: (in category 'accessing') ----- - ----- Method: Json class>>escapeForCharacter: (in category 'as yet unclassified') ----- escapeForCharacter: c | asciiValue | (asciiValue := c asciiValue) < 128 ifTrue: [ ^escapeArray at: asciiValue + 1 ]. ^nil! Item was added: + ----- Method: Json class>>escapeSet (in category 'accessing') ----- + escapeSet + + ^escapeSet! Item was changed: + ----- Method: Json class>>initialize (in category 'class initialization') ----- - ----- Method: Json class>>initialize (in category 'as yet unclassified') ----- initialize "Json initialize." + | newEscapeArray newEscapeSet | + newEscapeArray := Array new: 128. + newEscapeSet := CharacterSet new. - escapeArray := Array new: 128. (0 to: 31), #(127) do: [ :each | + newEscapeArray at: each + 1 put: '\u', (each printStringHex padded: #left to: 4 with: $0). + newEscapeSet add: (Character value: each) ]. - escapeArray at: each + 1 put: '\u', (each printStringHex padded: #left to: 4 with: $0) ]. { $" -> '\"'. $\ -> '\\'. + $/ -> '\/'. "A hack, so the generated JSON will always be HTML+Javascript compatible, because the generated JSON will not contain the seqence </script>." Character backspace -> '\b'. Character lf -> '\n'. Character newPage -> '\f'. Character cr -> '\r'. Character tab -> '\t'. } do: [ :each | + newEscapeArray at: each key asciiValue + 1 put: each value. + newEscapeSet add: each key ]. + escapeArray := newEscapeArray. + escapeSet := newEscapeSet! - escapeArray at: each key asciiValue + 1 put: each value ]. - ! Item was changed: + ----- Method: Json class>>mimeType (in category 'accessing') ----- - ----- Method: Json class>>mimeType (in category 'as yet unclassified') ----- mimeType ^ 'application/x-json'! Item was changed: + ----- Method: Json class>>newWithConstructors: (in category 'instance creation') ----- - ----- Method: Json class>>newWithConstructors: (in category 'as yet unclassified') ----- newWithConstructors: aCollection | m | m := Dictionary new. aCollection do: [:each | (each isKindOf: Association) ifTrue: [m add: each] ifFalse: [m at: each name asString put: each]]. ^ self new ctorMap: m; yourself.! Item was removed: - ----- Method: Json class>>numbersMayContain: (in category 'as yet unclassified') ----- - numbersMayContain: aChar - ^ aChar isDigit or: [#($- $+ $. $e $E) includes: aChar]! Item was changed: + ----- Method: Json class>>readFrom: (in category 'instance creation') ----- - ----- Method: Json class>>readFrom: (in category 'as yet unclassified') ----- readFrom: aStream ^ self new readFrom: aStream.! Item was changed: + ----- Method: Json class>>render: (in category 'rendering') ----- - ----- Method: Json class>>render: (in category 'as yet unclassified') ----- render: anObject + + ^String streamContents: [ :stream | + anObject jsonWriteOn: stream ]! - | s | - s := WriteStream on: String new. - anObject jsonWriteOn: s. - ^ s contents.! Item was changed: + ----- Method: Json class>>render:withConstructor:on: (in category 'rendering') ----- - ----- Method: Json class>>render:withConstructor:on: (in category 'as yet unclassified') ----- render: anObject withConstructor: aConstructorName on: aStream aStream nextPutAll: '@', aConstructorName. anObject jsonWriteOn: aStream. ! Item was changed: + ----- Method: Json class>>renderInstanceVariables:of:on: (in category 'rendering') ----- - ----- Method: Json class>>renderInstanceVariables:of:on: (in category 'as yet unclassified') ----- renderInstanceVariables: aCollection of: anObject on: aStream | map | map := Dictionary new. aCollection do: [:ivarName | map at: ivarName put: (anObject instVarNamed: ivarName)]. self render: map withConstructor: anObject class name asString on: aStream! Item was added: + ----- Method: Json>>arrayBufferStream (in category 'private') ----- + arrayBufferStream + + ^arrayBufferStream ifNil: [ arrayBufferStream := (Array new: 10) writeStream ]! Item was added: + ----- Method: Json>>consume: (in category 'private') ----- + consume: aString + + | message | + 1 to: aString size do: [ :index | + (currentCharacter := stream next) == (aString at: index) ifFalse: [ + message := 'Expected ', (aString at: index) printString. + currentCharacter + ifNil: [ self incomplete: message ] + ifNotNil: [ self invalid: message ] ] ]. + currentCharacter := stream next! Item was removed: - ----- Method: Json>>consume:returning: (in category 'private') ----- - consume: aString returning: anObject - |v| - aString do: [:c | - v := stream next. - v ifNil: [JsonIncompleteError signal: 'Incomplete ''', aString, ''' seen']. - v == c ifFalse: [JsonInvalidError signal: 'Expected ''', aString, ''''] ]. - ^ anObject! Item was added: + ----- Method: Json>>error: (in category 'error handling') ----- + error: aString + + (currentCharacter isNil and: [ stream atEnd ]) + ifTrue: [ self incomplete: aString ] + ifFalse: [ self invalid: aString ]! Item was added: + ----- Method: Json>>incomplete: (in category 'error handling') ----- + incomplete: aString + + JsonIncompleteError signal: aString! Item was removed: - ----- Method: Json>>interpretStringEscape (in category 'private') ----- - interpretStringEscape - | c | - c := stream next. - c ifNil: [JsonIncompleteError signal: 'Expected character following ''\'' in string escape']. - c == $b ifTrue: [^ Character backspace]. - c == $n ifTrue: [^ Character lf]. - c == $f ifTrue: [^ Character newPage]. - c == $r ifTrue: [^ Character cr]. - c == $t ifTrue: [^ Character tab]. - c == $u ifTrue: [^ self unescapeUnicode]. - ^ c.! Item was added: + ----- Method: Json>>interpretStringEscape: (in category 'private') ----- + interpretStringEscape: aCharacter + + aCharacter == $b ifTrue: [ ^Character backspace ]. + aCharacter == $n ifTrue: [ ^Character lf ]. + aCharacter == $f ifTrue: [ ^Character newPage ]. + aCharacter == $r ifTrue: [ ^Character cr ]. + aCharacter == $t ifTrue: [ ^Character tab ]. + aCharacter == $u ifTrue: [ ^self unescapeUnicode ]. + aCharacter == $" ifTrue: [ ^aCharacter ]. + aCharacter == $\ ifTrue: [ ^aCharacter ]. + aCharacter == $/ ifTrue: [ ^aCharacter ]. + self error: 'Unexpected escaped character: ', aCharacter asString + ! Item was added: + ----- Method: Json>>invalid: (in category 'error handling') ----- + invalid: aString + + JsonInvalidError signal: aString! Item was removed: - ----- Method: Json>>nextHexDigit (in category 'private') ----- - nextHexDigit - | c | - c := stream next. - c ifNil: [JsonIncompleteError signal: 'Expecting hex digit']. - c := c asUppercase. - (c isDigit or: [c >= $A and: [c <= $F]]) ifTrue: [^ c]. - JsonInvalidError signal: 'Expected hex digit'.! Item was changed: + ----- Method: Json>>readAny (in category 'private') ----- - ----- Method: Json>>readAny (in category 'parsing') ----- readAny + - "This is the main entry point for the JSON parser. See also readFrom: on the class side." - | c | self skipWhitespace. + currentCharacter == ${ ifTrue: [ ^self readDictionary ]. + currentCharacter == $[ ifTrue: [ ^self readArray ]. + currentCharacter == $" ifTrue: [ ^self readString ]. + currentCharacter == $t ifTrue: [ self consume: 'rue'. ^true ]. + currentCharacter == $f ifTrue: [ self consume: 'alse'. ^false ]. + currentCharacter == $n ifTrue: [ self consume: 'ull'. ^nil ]. + currentCharacter == $- ifTrue: [ ^self readNumber: true ]. + (#($0 $1 $2 $3 $4 $5 $6 $7 $8 $9) instVarsInclude: currentCharacter) ifTrue: [ + ^self readNumber: false ]. + currentCharacter == $@ ifTrue: [ ^self readConstructor ]. + self invalid: 'Unknown Json input'! - c := stream peek asLowercase. - c == ${ ifTrue: [stream next. ^ self readDictionary]. - c == $[ ifTrue: [stream next. ^ self readArray]. - c == $" ifTrue: [stream next. ^ self readString]. - c == $t ifTrue: [^ self consume: 'true' returning: true]. - c == $f ifTrue: [^ self consume: 'false' returning: false]. - c == $n ifTrue: [^ self consume: 'null' returning: nil]. - c == $@ ifTrue: [stream next. ^ self readConstructor]. - (Json numbersMayContain: c) ifTrue: [^ self readNumber]. - JsonInvalidError signal: 'Unknown Json input'! Item was changed: ----- Method: Json>>readArray (in category 'private') ----- readArray + + | initialPosition | + currentCharacter := stream next. - | a | self skipWhitespace. + currentCharacter == $] ifTrue: [ + currentCharacter := stream next. + ^#() ]. + initialPosition := self arrayBufferStream position. - (stream peekFor: $]) ifTrue: [ ^ #() ]. - a := OrderedCollection new. [ + arrayBufferStream nextPut: self readAny. - a add: self readAny. self skipWhitespace. + currentCharacter == $] ifTrue: [ + | result | + result := arrayBufferStream originalContents copyFrom: initialPosition + 1 to: arrayBufferStream position. + arrayBufferStream position: initialPosition. + currentCharacter := stream next. + ^result ]. + currentCharacter == $, ifFalse: [ self error: 'Unexpected character: ', currentCharacter asString ]. + currentCharacter := stream next ] repeat. - (stream peekFor: $]) ifTrue: [ ^ a asArray]. - (stream peekFor: $, ) ifFalse: [JsonInvalidError signal: 'Missing comma']. - ] repeat. ! Item was changed: ----- Method: Json>>readConstructor (in category 'private') ----- readConstructor + + ctorMap ifNil: [ ^self error: 'No constructors were declared.' ]. + self resetStringBufferStream. + [ (currentCharacter := stream next) == $. or: [ currentCharacter isLetter ] ] whileTrue: [ + stringBufferStream nextPut: currentCharacter ]. + (ctorMap at: stringBufferStream contents ifAbsent: nil) ifNotNil: [ :constructor | + ^constructor constructFromJson: self readAny ]. + self error: 'Unknown constructor: ', stringBufferStream contents! - | s c v ctor | - s := WriteStream on: ''. - [ - c := stream peek. - c ifNil: [JsonIncompleteError signal: 'Premature EOF reading constructor name']. - ((c == $.) or: [c isLetter]) - ifTrue: [s nextPut: c. stream next] - ifFalse: [ - v := self readAny. - s := s contents. - ctor := ctorMap ifNotNil: [ctor := ctorMap at: s ifAbsent: [nil]]. - ctor ifNil: [JsonInvalidError signal: 'Unknown ctor ', s]. - ^ ctor constructFromJson: v] - ] repeat. - ! Item was changed: ----- Method: Json>>readDictionary (in category 'private') ----- readDictionary + + | result key commaNeeded | + result := JsonObject new. + commaNeeded := false. + currentCharacter := stream next. - | m k v needComma | - m := JsonObject new. - needComma := false. [ self skipWhitespace. + currentCharacter == $} ifTrue: [ + currentCharacter := stream next. + ^result ]. + commaNeeded + ifFalse: [ commaNeeded := true ] + ifTrue: [ + currentCharacter == $, ifFalse: [ self error: 'Missing comma' ]. + currentCharacter := stream next. + self skipWhitespace ]. + currentCharacter == $" ifFalse: [ self error: 'Key in dictionary must be string' ]. + key := self readString. - (stream peekFor: $}) ifTrue: [ ^ m]. - needComma - ifTrue: [ (stream peekFor: $,) ifFalse: [JsonInvalidError signal: 'Missing comma']. - self skipWhitespace] - ifFalse: [needComma := true]. - " k := self readAny. " - (stream peekFor: $") ifFalse: [JsonInvalidError signal: 'Key in dictionary must be string']. - k := self readString. self skipWhitespace. + currentCharacter == $: ifFalse: [ self error: 'Missing colon' ]. + currentCharacter := stream next. + result at: key put: self readAny ] repeat. - (stream peekFor: $:) ifFalse: [JsonInvalidError signal: 'Missing colon']. - v := self readAny. - m at: k put: v. - ] repeat. ! Item was changed: ----- Method: Json>>readFrom: (in category 'parsing') ----- readFrom: aStream + + | result | + stream := aStream. + numberParser ifNotNil: [ numberParser on: stream ]. + currentCharacter := stream next. + result := self readAny. + stream atEnd ifFalse: [ stream skip: -1 ]. "Undo prereading." + ^result! - self stream: aStream. - ^ self readAny! Item was removed: - ----- Method: Json>>readNumber (in category 'private') ----- - readNumber - | acc c | - acc := WriteStream on: ''. - [ - c := stream peek. - (c isNil not and: [Json numbersMayContain: c]) ifFalse: [ - [^ acc contents asNumber] on: Error do: [JsonInvalidError signal: 'Invalid number']]. - acc nextPut: c. - stream next. - ] repeat.! Item was added: + ----- Method: Json>>readNumber: (in category 'private') ----- + readNumber: negative + + | result | + negative ifFalse: [ stream skip: -1 ]. + result := (numberParser ifNil: [ + numberParser := JsonNumberParser new + on: stream; + failBlock: [ self error: 'Invalid number.' ]; + yourself ]) + nextNumber: negative. + currentCharacter := stream next. + ^result + ! Item was changed: ----- Method: Json>>readString (in category 'private') ----- readString + + self resetStringBufferStream. - | s c | - s := WriteStream on: ''. [ + currentCharacter := stream next ifNil: [self incomplete: 'Unexpected end of string' ]. + currentCharacter == $" ifTrue: [ + currentCharacter := stream next. + ^stringBufferStream contents ]. + currentCharacter == $\ + ifTrue: [ + stringBufferStream nextPut: (self interpretStringEscape: (stream next ifNil: [ + self incomplete: 'Unexpected end of string' ])) ] + ifFalse: [ stringBufferStream nextPut: currentCharacter ] ] repeat! - c := stream next. - c ifNil: [JsonIncompleteError signal: 'Incomplete read of JSON string']. - c == $\ - ifTrue: [s nextPut: self interpretStringEscape.] - ifFalse: [c == $" ifTrue: [^ s contents.]. - s nextPut: c] - ] repeat.! Item was added: + ----- Method: Json>>resetStringBufferStream (in category 'private') ----- + resetStringBufferStream + + stringBufferStream + ifNil: [ stringBufferStream := ReadWriteStream on: (String new: 64) ] + ifNotNil: [ stringBufferStream resetToStart ]! Item was removed: - ----- Method: Json>>skipComment (in category 'private') ----- - skipComment - stream peek == $/ ifTrue: [ - stream next. - stream peek == $/ - ifTrue: [self skipToEndOfLine] - ifFalse: [stream peek == $* - ifTrue: [stream next. self skipCommentBody] - ifFalse: [JsonInvalidError signal: 'Invalid comment syntax']]] - ! Item was removed: - ----- Method: Json>>skipCommentBody (in category 'private') ----- - skipCommentBody - [ - [stream next == $*] whileFalse. - stream peek == $/ - ] whileFalse. - stream next. "skip that last slash" - self skipWhitespace.! Item was removed: - ----- Method: Json>>skipToEndOfLine (in category 'private') ----- - skipToEndOfLine - | cr lf | - cr := Character cr. lf := Character lf. - [ | c | (c := stream peek) == cr or: [ c == lf]] whileFalse: [stream next]. - self skipWhitespace! Item was changed: ----- Method: Json>>skipWhitespace (in category 'private') ----- skipWhitespace + + currentCharacter ifNil: [ + self incomplete: 'Input stream is empty' ]. + [ currentCharacter isSeparator ] whileTrue: [ + currentCharacter := stream next ifNil: [ + self incomplete: 'Input stream is empty' ]. ]! - |c| - [ - c := stream peek. - c ifNil: [JsonIncompleteError signal: 'Expected JSON input']. - c isSeparator - ] whileTrue: [stream next]. - self skipComment.! Item was changed: + ----- Method: Json>>stream: (in category 'private') ----- + stream: aStream + "For testing purposes only" - ----- Method: Json>>stream: (in category 'accessing') ----- - stream: anObject - "Set the value of stream" + stream := aStream. + numberParser ifNotNil: [ numberParser on: stream ]. + currentCharacter := stream next! - stream := anObject. - (stream respondsTo: #reset) ifTrue: [ - stream reset. - ]. - ! Item was changed: ----- Method: Json>>unescapeUnicode (in category 'private') ----- unescapeUnicode + + | code digitValue | + code := 0. + 1 to: 4 do: [ :index | + (digitValue := (stream next ifNil: [ self incomplete: 'Unexpected end of stream' ]) digitValue) < 0 ifTrue: [ + self invalid: 'Invalid hexadecimal digit' ]. + digitValue < 16 + ifTrue: [ code := code * 16 + digitValue ] + ifFalse: [ self invalid: 'Invalid hexadecimal digit' ] ]. + ^Character value: code! - |string a b c d| - a := self nextHexDigit. - b := self nextHexDigit. - c := self nextHexDigit. - d := self nextHexDigit. - string := String with: a with: b with: c with: d. - ^ Unicode value: (Integer readFrom: string readStream base: 16)! Item was added: + NumberParser subclass: #JsonNumberParser + instanceVariableNames: 'fraction' + classVariableNames: '' + poolDictionaries: '' + category: 'JSON'! Item was added: + ----- Method: JsonNumberParser>>allowPlusSign (in category 'accessing') ----- + allowPlusSign + + ^false! Item was added: + ----- Method: JsonNumberParser>>allowPlusSignInExponent (in category 'accessing') ----- + allowPlusSignInExponent + + ^true! Item was added: + ----- Method: JsonNumberParser>>error: (in category 'error') ----- + error: aString + + JsonSyntaxError signal: aString! Item was added: + ----- Method: JsonNumberParser>>exponentLetters (in category 'accessing') ----- + exponentLetters + + ^'eE'! Item was added: + ----- Method: JsonNumberParser>>initialize (in category 'initialize-release') ----- + initialize + + super initialize. + base := 10. + fraction := Fraction numerator: 0 denominator: 1! Item was added: + ----- Method: JsonNumberParser>>makeFloatFromMantissa:exponent: (in category 'parsing-private') ----- + makeFloatFromMantissa: mantissa exponent: exponent + + exponent = 0 ifTrue: [ ^mantissa asFloat ]. + exponent >= 16 ifTrue: [ ^(mantissa * (self tenRaisedTo: exponent)) asFloat ]. + (exponent >= -15 and: [ mantissa highBitOfMagnitude <= 54 ]) ifTrue: [ + exponent >= 1 ifTrue: [ ^mantissa asFloat * (self tenRaisedTo: exponent) asFloat ]. + ^mantissa asFloat / (self tenRaisedTo: exponent negated) asFloat ]. + ^(fraction setNumerator: mantissa denominator: (self tenRaisedTo: exponent negated)) asFloat! Item was added: + ----- Method: JsonNumberParser>>nextElementaryLargeInteger (in category 'parsing-large int') ----- + nextElementaryLargeInteger + "Form an unsigned integer with incoming digits from sourceStream. + Return this integer, or zero if no digits found. + Stop reading if end of digits or if a LargeInteger is formed. + Count the number of digits and the position of lastNonZero digit and store them in instVar." + + | digit value | + value := 0. + nDigits := 0. + lastNonZero := 0. + [ + value isLarge ifTrue: [ ^value ]. + ((digit := (sourceStream next ifNil: [ ^value ]) asInteger - 48 "$0 asInteger") < 0 + or: [ digit >= 10 ]) ifTrue: [ + sourceStream skip: -1. + ^value ]. + nDigits := nDigits + 1. + digit = 0 + ifFalse: [ + lastNonZero := nDigits. + value := value * 10 + digit ] + ifTrue: [ value := value * 10 ] ] repeat! Item was added: + ----- Method: JsonNumberParser>>nextNumber: (in category 'parsing-public') ----- + nextNumber: negative + + | numberOfTrailingZeroInIntegerPart numberOfTrailingZeroInFractionPart numberOfNonZeroFractionDigits mantissa value | + integerPart := self nextUnsignedIntegerOrNil ifNil: [ ^self error: 'Missing integer part!!' ]. + numberOfTrailingZeroInIntegerPart := nDigits - lastNonZero. + (sourceStream peekFor: $.) ifFalse: [ "No fraction part" + negative ifTrue: [ integerPart := integerPart negated ]. + self readExponent ifFalse: [ ^integerPart ]. + exponent > 0 ifTrue: [ ^integerPart * (self tenRaisedTo: exponent) ]. + ^(Fraction numerator: integerPart denominator: (self tenRaisedTo: exponent negated)) asFloat ]. + fractionPart := self nextUnsignedIntegerOrNil ifNil: [ self error: 'Missing fraction part!!' ]. + fractionPart isZero ifTrue: [ + self readExponent ifFalse: [ + negative ifTrue: [ + integerPart isZero ifTrue: [ ^Float negativeZero ]. + ^integerPart negated ]. + ^integerPart ]. + exponent >= 0 ifTrue: [ + negative ifTrue: [ integerPart := integerPart negated ]. + ^integerPart * (self tenRaisedTo: exponent) ]. + value := self makeFloatFromMantissa: integerPart exponent: exponent. + negative ifTrue: [ ^value negated ]. + ^value ]. + numberOfTrailingZeroInFractionPart := nDigits - lastNonZero. + numberOfNonZeroFractionDigits := lastNonZero. + self readExponent. + exponent := exponent - numberOfNonZeroFractionDigits. + mantissa := integerPart * (self tenRaisedTo: numberOfNonZeroFractionDigits) + (fractionPart // (self tenRaisedTo: numberOfTrailingZeroInFractionPart)). + value := self makeFloatFromMantissa: mantissa exponent: exponent. + negative ifTrue: [ ^value negated ]. + ^value! Item was added: + ----- Method: JsonNumberParser>>nextUnsignedIntegerOrNil (in category 'parsing-public') ----- + nextUnsignedIntegerOrNil + "Form an unsigned integer with incoming digits from sourceStream. + Answer this integer, or nil if no digit found. + Count the number of digits and the position of lastNonZero digit and store them in instVar" + + | nPackets high nDigitsHigh lastNonZeroHigh low | + "read no more digits than one elementary LargeInteger" + high := self nextElementaryLargeInteger. + nDigits = 0 ifTrue: [^nil]. + + "Not enough digits to form a LargeInteger, stop iteration" + high isLarge ifFalse: [^high]. + + "We now have to engage arithmetic with LargeInteger + Decompose the integer in a high and low packets of growing size:" + nPackets := 1. + nDigitsHigh := nDigits. + lastNonZeroHigh := lastNonZero. + [ + low := self nextLargeIntegerBase: 10 nPackets: nPackets . + high := high * (self tenRaisedTo: nDigits) + low. + lastNonZero = 0 ifFalse: [lastNonZeroHigh := lastNonZero + nDigitsHigh]. + nDigitsHigh := nDigitsHigh + nDigits. + low isLarge] + whileTrue: [nPackets := nPackets * 2]. + + nDigits := nDigitsHigh. + lastNonZero := lastNonZeroHigh. + ^high! Item was added: + ----- Method: JsonNumberParser>>tenRaisedTo: (in category 'parsing-private') ----- + tenRaisedTo: anInteger + + anInteger >= 0 ifFalse: [ ^10 raisedToInteger: anInteger ]. + anInteger >= 16 ifTrue: [ ^10 raisedToInteger: anInteger ]. + ^#(1 10 100 1000 10000 100000 1000000 10000000 100000000 1000000000 10000000000 100000000000 1000000000000 10000000000000 100000000000000 1000000000000000) at: anInteger + 1! Item was changed: ----- Method: JsonObject>>doesNotUnderstand: (in category 'as yet unclassified') ----- doesNotUnderstand: aMessage + + | key precedence | - | key | key := aMessage selector. + (precedence := key precedence) = 1 ifTrue: [ ^self at: key ifAbsent: nil ]. + (precedence = 3 and: [ (key indexOf: $:) = key size ]) ifTrue: [ + ^self + at: key allButLast asSymbol + put: aMessage arguments first ]. + ^super doesNotUnderstand: aMessage! - key isUnary ifTrue: [^ self at: key ifAbsent: [nil]]. - ^ (key isKeyword and: [(key occurrencesOf: $:) = 1]) - ifTrue: [key := key allButLast asSymbol. - self at: key put: aMessage arguments first] - ifFalse: [super doesNotUnderstand: aMessage] - - ! Item was added: + OrderedDictionary subclass: #OrderedJsonObject + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'JSON'! Item was added: + ----- Method: OrderedJsonObject class>>fromAssociations: (in category 'as yet unclassified') ----- + fromAssociations: collectionOfAssociations + + | result | + result := self new. + + collectionOfAssociations do: [:each | + result at: each key put: each value ]. + ^ result! Item was added: + ----- Method: OrderedJsonObject>>at: (in category 'accessing') ----- + at: aKey + + "make it work more like javascript objects" + ^ self at: aKey ifAbsent: [nil]! Item was added: + ----- Method: OrderedJsonObject>>doesNotUnderstand: (in category 'as yet unclassified') ----- + doesNotUnderstand: aMessage + + | key precedence | + key := aMessage selector. + (precedence := key precedence) = 1 ifTrue: [ ^self at: key ifAbsent: nil ]. + (precedence = 3 and: [ (key indexOf: $:) = key size ]) ifTrue: [ + ^self + at: key allButLast asSymbol + put: aMessage arguments first ]. + ^super doesNotUnderstand: aMessage! Item was added: + ----- Method: OrderedJsonObject>>name (in category 'accessing') ----- + name + "override 'cause Object defines this" + ^self at: 'name'! Item was added: + ----- Method: OrderedJsonObject>>value (in category 'accessing') ----- + value + "override 'cause Object defines this" + ^self at: 'value'! Item was added: + ----- Method: ScaledDecimal>>jsonWriteOn: (in category '*JSON-writing') ----- + jsonWriteOn: stream + + self printOn: stream showingDecimalPlaces: scale! Item was changed: ----- Method: String>>jsonWriteOn: (in category '*JSON-writing') ----- jsonWriteOn: aStream + | index start | aStream nextPut: $". + start := 1. + [ (index := self indexOfAnyOf: Json escapeSet startingAt: start) = 0 ] whileFalse: [ + aStream next: index - start putAll: self startingAt: start. + aStream nextPutAll: (Json escapeForCharacter: (self at: index)). + start := index + 1 ]. + start <= self size ifTrue: [ + aStream next: self size + 1 - start putAll: self startingAt: start ]. - self do: [ :ch | - (Json escapeForCharacter: ch) - ifNil: [ aStream nextPut: ch ] - ifNotNil: [ :replacement | - aStream nextPutAll: replacement ] ]. aStream nextPut: $". ! Item was added: + ----- Method: Time>>jsonWriteOn: (in category '*JSON') ----- + jsonWriteOn: stream + + stream nextPut: $". + self print24: true showSeconds: true on: stream. + stream nextPut: $"!

1 0

The Inbox: JSON-tonyg.39.mcz
by commits＠source.squeak.org 11 Feb '18

11 Feb '18

Tony Garnock-Jones uploaded a new version of JSON to project The Inbox: http://source.squeak.org/inbox/JSON-tonyg.39.mcz ==================== Summary ==================== Name: JSON-tonyg.39 Author: tonyg Time: 17 August 2016, 2:19:56.932763 pm UUID: 4c0c7961-cd4f-49c5-b109-d34df81e4808 Ancestors: JSON-FabN.38 Change JsonTests>>testStreaming to compare to JsonObject new, rather than just testing isDictionary. testStreaming should not only check that the result is a dictionary, but that it is empty. ==================== Snapshot ==================== SystemOrganization addCategory: #JSON! ----- Method: Integer>>jsonWriteOn: (in category '*JSON-writing') ----- jsonWriteOn: aWriteStream ^ self printOn: aWriteStream base: 10 ! ----- Method: UndefinedObject>>jsonWriteOn: (in category '*JSON-writing') ----- jsonWriteOn: aWriteStream aWriteStream nextPutAll: 'null'! Object subclass: #Json instanceVariableNames: 'stream ctorMap' classVariableNames: '' poolDictionaries: '' category: 'JSON'! Json class instanceVariableNames: 'escapeArray'! !Json commentStamp: '<historical>' prior: 0! This class reads and writes JSON format data - strings, numbers, boolean, nil, arrays and dictionaries. See http://www.crockford.com/JSON/index.html. It has been extended with syntax for invoking a prearranged list of constructors on read objects.! Json class instanceVariableNames: 'escapeArray'! ----- Method: Json class>>escapeForCharacter: (in category 'as yet unclassified') ----- escapeForCharacter: c | asciiValue | (asciiValue := c asciiValue) < 128 ifTrue: [ ^escapeArray at: asciiValue + 1 ]. ^nil! ----- Method: Json class>>initialize (in category 'as yet unclassified') ----- initialize "Json initialize." escapeArray := Array new: 128. (0 to: 31), #(127) do: [ :each | escapeArray at: each + 1 put: '\u', (each printStringHex padded: #left to: 4 with: $0) ]. { $" -> '\"'. $\ -> '\\'. Character backspace -> '\b'. Character lf -> '\n'. Character newPage -> '\f'. Character cr -> '\r'. Character tab -> '\t'. } do: [ :each | escapeArray at: each key asciiValue + 1 put: each value ]. ! ----- Method: Json class>>mimeType (in category 'as yet unclassified') ----- mimeType ^ 'application/x-json'! ----- Method: Json class>>newWithConstructors: (in category 'as yet unclassified') ----- newWithConstructors: aCollection | m | m := Dictionary new. aCollection do: [:each | (each isKindOf: Association) ifTrue: [m add: each] ifFalse: [m at: each name asString put: each]]. ^ self new ctorMap: m; yourself.! ----- Method: Json class>>numbersMayContain: (in category 'as yet unclassified') ----- numbersMayContain: aChar ^ aChar isDigit or: [#($- $+ $. $e $E) includes: aChar]! ----- Method: Json class>>readFrom: (in category 'as yet unclassified') ----- readFrom: aStream ^ self new readFrom: aStream.! ----- Method: Json class>>render: (in category 'as yet unclassified') ----- render: anObject | s | s := WriteStream on: String new. anObject jsonWriteOn: s. ^ s contents.! ----- Method: Json class>>render:withConstructor:on: (in category 'as yet unclassified') ----- render: anObject withConstructor: aConstructorName on: aStream aStream nextPutAll: '@', aConstructorName. anObject jsonWriteOn: aStream. ! ----- Method: Json class>>renderInstanceVariables:of:on: (in category 'as yet unclassified') ----- renderInstanceVariables: aCollection of: anObject on: aStream | map | map := Dictionary new. aCollection do: [:ivarName | map at: ivarName put: (anObject instVarNamed: ivarName)]. self render: map withConstructor: anObject class name asString on: aStream! ----- Method: Json>>consume:returning: (in category 'private') ----- consume: aString returning: anObject |v| aString do: [:c | v := stream next. v ifNil: [JsonIncompleteError signal: 'Incomplete ''', aString, ''' seen']. v == c ifFalse: [JsonInvalidError signal: 'Expected ''', aString, ''''] ]. ^ anObject! ----- Method: Json>>ctorMap (in category 'accessing') ----- ctorMap ^ ctorMap! ----- Method: Json>>ctorMap: (in category 'accessing') ----- ctorMap: m ctorMap := m! ----- Method: Json>>interpretStringEscape (in category 'private') ----- interpretStringEscape | c | c := stream next. c ifNil: [JsonIncompleteError signal: 'Expected character following ''\'' in string escape']. c == $b ifTrue: [^ Character backspace]. c == $n ifTrue: [^ Character lf]. c == $f ifTrue: [^ Character newPage]. c == $r ifTrue: [^ Character cr]. c == $t ifTrue: [^ Character tab]. c == $u ifTrue: [^ self unescapeUnicode]. ^ c.! ----- Method: Json>>nextHexDigit (in category 'private') ----- nextHexDigit | c | c := stream next. c ifNil: [JsonIncompleteError signal: 'Expecting hex digit']. c := c asUppercase. (c isDigit or: [c >= $A and: [c <= $F]]) ifTrue: [^ c]. JsonInvalidError signal: 'Expected hex digit'.! ----- Method: Json>>readAny (in category 'parsing') ----- readAny "This is the main entry point for the JSON parser. See also readFrom: on the class side." | c | self skipWhitespace. c := stream peek asLowercase. c == ${ ifTrue: [stream next. ^ self readDictionary]. c == $[ ifTrue: [stream next. ^ self readArray]. c == $" ifTrue: [stream next. ^ self readString]. c == $t ifTrue: [^ self consume: 'true' returning: true]. c == $f ifTrue: [^ self consume: 'false' returning: false]. c == $n ifTrue: [^ self consume: 'null' returning: nil]. c == $@ ifTrue: [stream next. ^ self readConstructor]. (Json numbersMayContain: c) ifTrue: [^ self readNumber]. JsonInvalidError signal: 'Unknown Json input'! ----- Method: Json>>readArray (in category 'private') ----- readArray | a | self skipWhitespace. (stream peekFor: $]) ifTrue: [ ^ #() ]. a := OrderedCollection new. [ a add: self readAny. self skipWhitespace. (stream peekFor: $]) ifTrue: [ ^ a asArray]. (stream peekFor: $, ) ifFalse: [JsonInvalidError signal: 'Missing comma']. ] repeat. ! ----- Method: Json>>readConstructor (in category 'private') ----- readConstructor | s c v ctor | s := WriteStream on: ''. [ c := stream peek. c ifNil: [JsonIncompleteError signal: 'Premature EOF reading constructor name']. ((c == $.) or: [c isLetter]) ifTrue: [s nextPut: c. stream next] ifFalse: [ v := self readAny. s := s contents. ctor := ctorMap ifNotNil: [ctor := ctorMap at: s ifAbsent: [nil]]. ctor ifNil: [JsonInvalidError signal: 'Unknown ctor ', s]. ^ ctor constructFromJson: v] ] repeat. ! ----- Method: Json>>readDictionary (in category 'private') ----- readDictionary | m k v needComma | m := JsonObject new. needComma := false. [ self skipWhitespace. (stream peekFor: $}) ifTrue: [ ^ m]. needComma ifTrue: [ (stream peekFor: $,) ifFalse: [JsonInvalidError signal: 'Missing comma']. self skipWhitespace] ifFalse: [needComma := true]. " k := self readAny. " (stream peekFor: $") ifFalse: [JsonInvalidError signal: 'Key in dictionary must be string']. k := self readString. self skipWhitespace. (stream peekFor: $:) ifFalse: [JsonInvalidError signal: 'Missing colon']. v := self readAny. m at: k put: v. ] repeat. ! ----- Method: Json>>readFrom: (in category 'parsing') ----- readFrom: aStream self stream: aStream. ^ self readAny! ----- Method: Json>>readNumber (in category 'private') ----- readNumber | acc c | acc := WriteStream on: ''. [ c := stream peek. (c isNil not and: [Json numbersMayContain: c]) ifFalse: [ [^ acc contents asNumber] on: Error do: [JsonInvalidError signal: 'Invalid number']]. acc nextPut: c. stream next. ] repeat.! ----- Method: Json>>readString (in category 'private') ----- readString | s c | s := WriteStream on: ''. [ c := stream next. c ifNil: [JsonIncompleteError signal: 'Incomplete read of JSON string']. c == $\ ifTrue: [s nextPut: self interpretStringEscape.] ifFalse: [c == $" ifTrue: [^ s contents.]. s nextPut: c] ] repeat.! ----- Method: Json>>skipComment (in category 'private') ----- skipComment stream peek == $/ ifTrue: [ stream next. stream peek == $/ ifTrue: [self skipToEndOfLine] ifFalse: [stream peek == $* ifTrue: [stream next. self skipCommentBody] ifFalse: [JsonInvalidError signal: 'Invalid comment syntax']]] ! ----- Method: Json>>skipCommentBody (in category 'private') ----- skipCommentBody [ [stream next == $*] whileFalse. stream peek == $/ ] whileFalse. stream next. "skip that last slash" self skipWhitespace.! ----- Method: Json>>skipToEndOfLine (in category 'private') ----- skipToEndOfLine | cr lf | cr := Character cr. lf := Character lf. [ | c | (c := stream peek) == cr or: [ c == lf]] whileFalse: [stream next]. self skipWhitespace! ----- Method: Json>>skipWhitespace (in category 'private') ----- skipWhitespace |c| [ c := stream peek. c ifNil: [JsonIncompleteError signal: 'Expected JSON input']. c isSeparator ] whileTrue: [stream next]. self skipComment.! ----- Method: Json>>stream (in category 'accessing') ----- stream "Answer the value of stream" ^ stream! ----- Method: Json>>stream: (in category 'accessing') ----- stream: anObject "Set the value of stream" stream := anObject. (stream respondsTo: #reset) ifTrue: [ stream reset. ]. ! ----- Method: Json>>unescapeUnicode (in category 'private') ----- unescapeUnicode |string a b c d| a := self nextHexDigit. b := self nextHexDigit. c := self nextHexDigit. d := self nextHexDigit. string := String with: a with: b with: c with: d. ^ Unicode value: (Integer readFrom: string readStream base: 16)! Object subclass: #JsonDummyTestObject instanceVariableNames: 'a b c' classVariableNames: '' poolDictionaries: '' category: 'JSON'! ----- Method: JsonDummyTestObject class>>constructFromJson: (in category 'as yet unclassified') ----- constructFromJson: j ^ self new a: (j at: 'a'); b: (j at: 'b'); c: (j at: 'c'); yourself! ----- Method: JsonDummyTestObject>>= (in category 'as yet unclassified') ----- = other ^ other class == self class and: [ a = other a and: [ b = other b and: [ c = other c]]]! ----- Method: JsonDummyTestObject>>a (in category 'accessing') ----- a "Answer the value of a" ^ a! ----- Method: JsonDummyTestObject>>a: (in category 'accessing') ----- a: anObject "Set the value of a" a := anObject! ----- Method: JsonDummyTestObject>>b (in category 'accessing') ----- b "Answer the value of b" ^ b! ----- Method: JsonDummyTestObject>>b: (in category 'accessing') ----- b: anObject "Set the value of b" b := anObject! ----- Method: JsonDummyTestObject>>c (in category 'accessing') ----- c "Answer the value of c" ^ c! ----- Method: JsonDummyTestObject>>c: (in category 'accessing') ----- c: anObject "Set the value of c" c := anObject! ----- Method: JsonDummyTestObject>>jsonWriteOn: (in category 'as yet unclassified') ----- jsonWriteOn: s Json renderInstanceVariables: {#a. #b. #c} of: self on: s ! ----- Method: Object>>asJsonString (in category '*JSON') ----- asJsonString ^ String streamContents: [:str | self jsonWriteOn: str ]! ----- Method: Number>>jsonWriteOn: (in category '*JSON-writing') ----- jsonWriteOn: aWriteStream self printOn: aWriteStream base: 10! ----- Method: Dictionary>>jsonWriteOn: (in category '*JSON-writing') ----- jsonWriteOn: aStream | needComma | needComma := false. aStream nextPut: ${. self associationsDo: [ :assoc | needComma ifTrue: [ aStream nextPut: $, ] ifFalse: [ needComma := true ]. assoc key jsonWriteOn: aStream. aStream nextPut: $:. assoc value jsonWriteOn: aStream ]. aStream nextPut: $}.! Dictionary subclass: #JsonObject instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'JSON'! ----- Method: JsonObject class>>fromAssociations: (in category 'as yet unclassified') ----- fromAssociations: collectionOfAssociations | result | result := self new. collectionOfAssociations do: [:each | result at: each key put: each value ]. ^ result! ----- Method: JsonObject>>at: (in category 'accessing') ----- at: aKey "make it work more like javascript objects" ^ self at: aKey ifAbsent: [nil]! ----- Method: JsonObject>>doesNotUnderstand: (in category 'as yet unclassified') ----- doesNotUnderstand: aMessage | key | key := aMessage selector. key isUnary ifTrue: [^ self at: key ifAbsent: [nil]]. ^ (key isKeyword and: [(key occurrencesOf: $:) = 1]) ifTrue: [key := key allButLast asSymbol. self at: key put: aMessage arguments first] ifFalse: [super doesNotUnderstand: aMessage] ! ----- Method: JsonObject>>name (in category 'accessing') ----- name "override 'cause Object defines this" ^self at: 'name'! ----- Method: JsonObject>>value (in category 'accessing') ----- value "override 'cause Object defines this" ^self at: 'value'! ----- Method: Collection>>jsonWriteOn: (in category '*json') ----- jsonWriteOn: aStream "By default, use array braces " aStream nextPut: $[. self do: [:each | each jsonWriteOn: aStream ] separatedBy: [ aStream nextPut: $, ]. aStream nextPut: $]! ----- Method: True>>jsonWriteOn: (in category '*JSON-writing') ----- jsonWriteOn: aStream aStream nextPutAll: 'true'! ----- Method: Association>>jsonWriteOn: (in category '*JSON-writing') ----- jsonWriteOn: aStream self key asString jsonWriteOn: aStream. aStream nextPut: $:; space. self value jsonWriteOn: aStream.! ----- Method: WriteStream>>jsonPrint: (in category '*json-printing') ----- jsonPrint: anObject anObject jsonWriteOn: self! ----- Method: Text>>jsonWriteOn: (in category '*json-printing') ----- jsonWriteOn: aStream self string jsonWriteOn: aStream! TestCase subclass: #JsonTests instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'JSON'! !JsonTests commentStamp: '<historical>' prior: 0! I provide a number of test cases for class Json.! ----- Method: JsonTests>>assertIncompleteJson: (in category 'as yet unclassified') ----- assertIncompleteJson: aString self should: [self readFrom: aString] raise: JsonIncompleteError! ----- Method: JsonTests>>assertInvalidJson: (in category 'as yet unclassified') ----- assertInvalidJson: aString self should: [self readFrom: aString] raise: JsonInvalidError! ----- Method: JsonTests>>json:equals: (in category 'as yet unclassified') ----- json: aString equals: aValue | readValue | readValue := self readFrom: aString. self assert: readValue = aValue.! ----- Method: JsonTests>>readFrom: (in category 'as yet unclassified') ----- readFrom: aString ^ (Json newWithConstructors: {JsonDummyTestObject.}) readFrom: aString readStream ! ----- Method: JsonTests>>render:equals: (in category 'as yet unclassified') ----- render: anObject equals: aString self assert: (Json render: anObject) = aString! ----- Method: JsonTests>>simpleDummyObject (in category 'as yet unclassified') ----- simpleDummyObject ^ JsonDummyTestObject new a: 1; b: 2; c: 3; yourself! ----- Method: JsonTests>>testArray (in category 'as yet unclassified') ----- testArray self json: '[]' equals: #(). self json: '[[]]' equals: #(#()). self json: '[[], []]' equals: #(#() #()). self json: '["hi", "there"]' equals: #('hi' 'there'). self json: '[["a", "b", null]]' equals: #(('a' 'b' nil)).! ----- Method: JsonTests>>testAtomFalse (in category 'as yet unclassified') ----- testAtomFalse self json: 'false' equals: false. self json: ' false' equals: false. self json: 'false ' equals: false. self json: ' false ' equals: false. ! ----- Method: JsonTests>>testAtomNull (in category 'as yet unclassified') ----- testAtomNull self json: 'null' equals: nil. self json: ' null' equals: nil. self json: 'null ' equals: nil. self json: ' null ' equals: nil. ! ----- Method: JsonTests>>testAtomNumber (in category 'as yet unclassified') ----- testAtomNumber self json: '1' equals: 1. self json: '0123' equals: 123. self json: '1.23e2' equals: 123. self json: '-1' equals: -1. self json: '-0' equals: 0. self json: '[-1.2]' equals: #(-1.2).! ----- Method: JsonTests>>testAtomString (in category 'as yet unclassified') ----- testAtomString self json: '"hi"' equals: 'hi'. self json: '"\""' equals: '"'. self json: '"\\"' equals: '\'. self json: '""' equals: ''. self json: '"a\u0004b"' equals: ({$a. Character value: 4. $b} as: String). self json: '"a\nb"' equals: ({$a. Character lf. $b} as: String).! ----- Method: JsonTests>>testAtomTrue (in category 'as yet unclassified') ----- testAtomTrue self json: 'true' equals: true. self json: ' true' equals: true. self json: 'true ' equals: true. self json: ' true ' equals: true. ! ----- Method: JsonTests>>testCtor (in category 'as yet unclassified') ----- testCtor self json: '@JsonDummyTestObject {"a": 1, "b": 2, "c": 3}' equals: self simpleDummyObject. self json: (Json render: self simpleDummyObject) equals: self simpleDummyObject.! ----- Method: JsonTests>>testDictionary (in category 'as yet unclassified') ----- testDictionary self json: '{}' equals: (JsonObject new). self json: '{"a": "a"}' equals: (JsonObject new at: 'a' put: 'a'; yourself). self json: '{"a": [[]]}' equals: (JsonObject new at: 'a' put: #(#()); yourself). self json: '{"a":"b", "b":"a"}' equals: (JsonObject new add: 'a'->'b'; add: 'b'->'a';yourself).! ----- Method: JsonTests>>testIncomplete (in category 'as yet unclassified') ----- testIncomplete self assertIncompleteJson: ''. self assertIncompleteJson: ' '. self assertIncompleteJson: ' tr'. self assertIncompleteJson: 'tru'. self assertIncompleteJson: '['. self assertIncompleteJson: '[true'. self assertIncompleteJson: '[true,'. self assertIncompleteJson: '{'. self assertIncompleteJson: '{"hi"'. self assertIncompleteJson: '{"hi":'. self assertIncompleteJson: '{"hi":true'. self assertIncompleteJson: '{"hi":true,'. self assertIncompleteJson: '{"hi":true,"'. self assertIncompleteJson: '"hello'. self assertIncompleteJson: '"hello '. self assertIncompleteJson: '"hello\'. self assertIncompleteJson: '"\u26'.! ----- Method: JsonTests>>testInvalid (in category 'as yet unclassified') ----- testInvalid self assertInvalidJson: 'x'. self assertInvalidJson: ' x'. self assertInvalidJson: ' trx'. self assertInvalidJson: 'trux'. self assertInvalidJson: '.'. self assertInvalidJson: ':'. self assertInvalidJson: ','. self assertInvalidJson: ']'. self assertInvalidJson: '}'. self assertInvalidJson: '[x'. self assertInvalidJson: '[true t'. self assertInvalidJson: '[true,]'. self assertInvalidJson: '{]'. self assertInvalidJson: '{,'. self assertInvalidJson: '{"hi",'. self assertInvalidJson: '{"hi":x'. self assertInvalidJson: '{"hi":,'. self assertInvalidJson: '{"hi":true "'. self assertInvalidJson: '{"hi":true,}'. self assertInvalidJson: '\u263A'.! ----- Method: JsonTests>>testInvalidUnicodeEscapes (in category 'as yet unclassified') ----- testInvalidUnicodeEscapes self assertInvalidJson: '"\u26"'. "Note that naively reading four chars runs off the end here, so we might see JsonIncompleteError, which would be wrong." self assertInvalidJson: '"\u2Z"'. self assertInvalidJson: '"\u2Z44"'.! ----- Method: JsonTests>>testMissingCtor (in category 'as yet unclassified') ----- testMissingCtor self assertInvalidJson: '@Missing[]'! ----- Method: JsonTests>>testMissingCtorNoMap (in category 'as yet unclassified') ----- testMissingCtorNoMap self should: [Json new readFrom: '@Missing[]' readStream] raise: JsonInvalidError! ----- Method: JsonTests>>testStreaming (in category 'as yet unclassified') ----- testStreaming | j | j := Json new stream: 'truefalsetrue[]{}1.234 5.678"A""B"nullnull' readStream. self assert: j readAny equals: true. self assert: j readAny equals: false. self assert: j readAny equals: true. self assert: j readAny equals: #(). self assert: j readAny equals: JsonObject new. self assert: j readAny equals: 1.234. self assert: j readAny equals: 5.678. self assert: j readAny equals: 'A'. self assert: j readAny equals: 'B'. self assert: j readAny equals: nil. self assert: j readAny equals: nil.! ----- Method: JsonTests>>testStringWithUnicode (in category 'as yet unclassified') ----- testStringWithUnicode | unicodeString | unicodeString := (Unicode value: 16r263A) asString. self json: '"\u263A"' equals:unicodeString. self json: '"\u263a"' equals:unicodeString. self json: '"', unicodeString, '"' equals: unicodeString. self render: unicodeString equals: '"', unicodeString, '"'.! ----- Method: JsonTests>>testWriteAssociation (in category 'as yet unclassified') ----- testWriteAssociation self render: 'key' -> 'value' equals: '"key": "value"'. self render: 'key' -> 2 equals: '"key": 2'. "keys should be strings" self render: 42 -> 2 equals: '"42": 2'. "try to do _something_ for more complex keys" self render: #(42 43 44) -> 2 equals: '"#(42 43 44)": 2'. ! ----- Method: JsonTests>>testWriteString (in category 'as yet unclassified') ----- testWriteString self render: '"' equals: '"\""'. self render: '\' equals: '"\\"'. self render: 'hi' equals: '"hi"'. self render: ({$a. Character lf. $b} as: String) equals: '"a\nb"'. self render: ({$a. Character value: 4. $b} as: String) equals: '"a\u0004b"'.! ----- Method: String>>jsonWriteOn: (in category '*JSON-writing') ----- jsonWriteOn: aStream aStream nextPut: $". self do: [ :ch | (Json escapeForCharacter: ch) ifNil: [ aStream nextPut: ch ] ifNotNil: [ :replacement | aStream nextPutAll: replacement ] ]. aStream nextPut: $". ! Error subclass: #JsonSyntaxError instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'JSON'! !JsonSyntaxError commentStamp: 'tonyg 4/29/2016 11:06' prior: 0! Class Json signals (possibly-indirect) instances of me when reading a JSON value from an input stream fails.! JsonSyntaxError subclass: #JsonIncompleteError instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'JSON'! !JsonIncompleteError commentStamp: 'tonyg 4/29/2016 11:37' prior: 0! I signal that reading a JSON value failed because more input is required, but that the input seen so far was not incorrect. Compare to JsonInvalidError. Be warned that reading numbers directly out of a stream can be ambiguous!! Consider reading from '1234'. Is the result intended to be 1234, or is there missing input, and the next character will be '5', making the result (possibly) 12345?! JsonSyntaxError subclass: #JsonInvalidError instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'JSON'! !JsonInvalidError commentStamp: 'tonyg 4/29/2016 11:06' prior: 0! I signal that reading a JSON value failed because the input didn't match the (extended)JSON grammar implemented by class Json.! ----- Method: False>>jsonWriteOn: (in category '*JSON-writing') ----- jsonWriteOn: aStream aStream nextPutAll: 'false'!

1 0

The Trunk: Kernel-tonyg.1152.mcz
by commits＠source.squeak.org 11 Feb '18

11 Feb '18

Tony Garnock-Jones uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-tonyg.1152.mcz ==================== Summary ==================== Name: Kernel-tonyg.1152 Author: tonyg Time: 11 February 2018, 4:07:32.778194 pm UUID: 3e6a5937-c9a5-4991-b9d7-c0e023cf75e3 Ancestors: Kernel-tonyg.1151 Clear out Promise rejecters and resolvers once the promise settles - already-fired callbacks will not be needed again, and if not cleared out, hang around forever, causing problems for long-lived, reusable promises. =============== Diff against Kernel-tonyg.1151 =============== Item was changed: ----- Method: Promise>>rejectWith: (in category 'resolving') ----- rejectWith: anObject "Reject this promise." mutex critical: [ + (state == #pending) ifTrue: [ | worklist | - (state == #pending) ifTrue: [ error := anObject. state := #rejected. + worklist := rejecters. + resolvers := #(). + rejecters := #(). + worklist do: [:r | self evaluateRejecter: r]]]! - rejecters do: [:r | self evaluateRejecter: r]]]! Item was changed: ----- Method: Promise>>resolveWith: (in category 'resolving') ----- resolveWith: arg "Resolve this promise. If arg is itself a Promise, make this promise depend upon it, as detailed in the Promises/A+ spec: https://promisesaplus.com/#the-promise-resolution-procedure" arg isPromise ifTrue: [ arg whenResolved: [:v | self resolveWith: v]. arg whenRejected: [:e | self rejectWith: e]] ifFalse: [ mutex critical: [ + (state == #pending) ifTrue: [ | worklist | - (state == #pending) ifTrue: [ value := arg. state := #fulfilled. + worklist := resolvers. + resolvers = #(). + rejecters := #(). + worklist do: [:r | self evaluateResolver: r]]]]! - resolvers do: [:r | self evaluateResolver: r]]]]! Item was changed: ----- Method: Promise>>whenRejected: (in category 'resolving') ----- whenRejected: aBlock "Evaluate aBlock when I am rejected" aBlock numArgs <= 1 ifFalse: [self error: 'Must be 0- or 1-argument block']. + mutex critical: [ + (state == #pending) + ifTrue: [rejecters := rejecters copyWith: aBlock] + ifFalse: [self isRejected ifTrue: [self evaluateRejecter: aBlock]]]. + ^ nil! - ^ mutex critical: [ - rejecters := rejecters copyWith: aBlock. - self isRejected ifTrue:[self evaluateRejecter: aBlock]. - ]! Item was changed: ----- Method: Promise>>whenResolved: (in category 'resolving') ----- whenResolved: aBlock "Evaluate aBlock when I am resolved" aBlock numArgs <= 1 ifFalse:[self error: 'Must be 0- or 1-argument block']. + mutex critical: [ + (state == #pending) + ifTrue: [resolvers := resolvers copyWith: aBlock] + ifFalse: [self isResolved ifTrue: [self evaluateResolver: aBlock]]]. + ^ nil! - ^ mutex critical: [ - resolvers := resolvers copyWith: aBlock. - self isResolved ifTrue:[self evaluateResolver: aBlock]. - ]!

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
15
Older →

Jump to page: