Mercurial Mercurial > hg > stx-libtool / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NewChangesBrowser.st
changeset 17586 da595acccff1
parent 17034 96c54689f887
child 17921 e003f86bb9ec 
--- a/NewChangesBrowser.st	Mon Jul 17 12:23:43 2017 +0200
+++ b/NewChangesBrowser.st	Mon Jul 17 12:30:54 2017 +0200
@@ -2559,7 +2559,7 @@
 
     prevMethodDefNr := changes indexOf: aChange.
     [(changes at:prevMethodDefNr) followUp] whileTrue:[
-	prevMethodDefNr := prevMethodDefNr - 1.
+        prevMethodDefNr := prevMethodDefNr - 1.
     ].
 
     "
@@ -2569,25 +2569,25 @@
     chunk isNil ifTrue:[^ nil].       "mhmh - empty"
 
     (chunk startsWith:'''---') ifTrue:[
-	words := chunk asCollectionOfWords.
-	words size > 2 ifTrue:[
-	    (words at:2) = 'checkin' ifTrue:[
-		name := words at:3.
-		aChange className: name.
-		^ name
-	    ]
-	].
+        words := chunk asCollectionOfWords.
+        words size > 2 ifTrue:[
+            (words at:2) = 'checkin' ifTrue:[
+                name := words at:3.
+                aChange className: name.
+                ^ name
+            ]
+        ].
     ].
 
     "/ fix it - otherwise, it cannot be parsed
     (chunk endsWith:'primitiveDefinitions:') ifTrue:[
-	chunk := chunk , ''''''
+        chunk := chunk , ''''''
     ].
     (chunk endsWith:'primitiveFunctions:') ifTrue:[
-	chunk := chunk , ''''''
+        chunk := chunk , ''''''
     ].
     (chunk endsWith:'primitiveVariables:') ifTrue:[
-	chunk := chunk , ''''''
+        chunk := chunk , ''''''
     ].
 
     "
@@ -2595,17 +2595,17 @@
     "
     oldDollarSetting := Parser allowDollarInIdentifier.
     [
-	Parser allowDollarInIdentifier:true.
-	aParseTree := Parser parseExpression:chunk.
-    ] valueNowOrOnUnwindDo:[
-	Parser allowDollarInIdentifier:oldDollarSetting
+        Parser allowDollarInIdentifier:true.
+        aParseTree := Parser parseExpression:chunk.
+    ] ensure:[
+        Parser allowDollarInIdentifier:oldDollarSetting
     ].
 
     (aParseTree isNil or:[aParseTree == #Error]) ifTrue:[
-	^ nil        "seems strange... (could be a comment)"
+        ^ nil        "seems strange... (could be a comment)"
     ].
     aParseTree isMessage ifFalse:[
-	^ nil        "very strange... (whats that ?)"
+        ^ nil        "very strange... (whats that ?)"
     ].
 
     "
@@ -2629,28 +2629,28 @@
        #'renameCategory:to:'
        #'instanceVariableNames:'
     ) includes:sel) ifTrue:[
-	"
-	 yes, the className is the receiver
-	"
-	(recTree notNil and:[recTree ~~ #Error]) ifTrue:[
-	    isMeta := false.
-	    recTree isUnaryMessage ifTrue:[
-		(recTree selector ~~ #class) ifTrue:[^ nil].
-		"id class methodsFor:..."
-		recTree := recTree receiver.
-		isMeta := true.
-	    ].
-	    recTree isPrimary ifTrue:[
-		name := recTree name.
-		isMeta ifTrue:[
-		    name := name , ' class'.
-		].
-		aChange className: name.
-		^ name
-	    ]
-	].
-	"more strange things"
-	^ nil
+        "
+         yes, the className is the receiver
+        "
+        (recTree notNil and:[recTree ~~ #Error]) ifTrue:[
+            isMeta := false.
+            recTree isUnaryMessage ifTrue:[
+                (recTree selector ~~ #class) ifTrue:[^ nil].
+                "id class methodsFor:..."
+                recTree := recTree receiver.
+                isMeta := true.
+            ].
+            recTree isPrimary ifTrue:[
+                name := recTree name.
+                isMeta ifTrue:[
+                    name := name , ' class'.
+                ].
+                aChange className: name.
+                ^ name
+            ]
+        ].
+        "more strange things"
+        ^ nil
     ].
 
     "
@@ -2658,59 +2658,59 @@
     "
     (('subclass:*' match:sel)
     or:[('variable*subclass:*' match:sel)]) ifTrue:[
-	"/ must parse the full changes text, to get
-	"/ privacy information.
-
-	changeStream := self streamForChange:aChange.
-	changeStream notNil ifTrue:[
-	    chunk := changeStream nextChunk.
-	    changeStream close.
-	    fullParseTree := Parser parseExpression:chunk.
-	    (fullParseTree isNil or:[fullParseTree == #Error]) ifTrue:[
-		fullParseTree := nil
-	    ].
-	    fullParseTree isMessage ifFalse:[
-		fullParseTree := nil
-	    ].
-	    "/ actually, the nil case cannot happen
-	    fullParseTree notNil ifTrue:[
-		aParseTree := fullParseTree.
-		sel := aParseTree selector.
-	    ].
-	].
-
-	arg1Tree := aParseTree arg1.
-	(arg1Tree notNil and:[arg1Tree isConstant]) ifTrue:[
-	    name := arg1Tree value asString.
-
-	    "/ is it a private-class ?
-	    ('*privateIn:' match:sel) ifTrue:[
-		ownerTree := aParseTree args last.
-		ownerName := ownerTree name asString.
-		name := ownerName , '::' , name
-	    ].
-	    aChange className: name.
-	    ^ name
-	].
-	"very strange"
-	^ nil
+        "/ must parse the full changes text, to get
+        "/ privacy information.
+
+        changeStream := self streamForChange:aChange.
+        changeStream notNil ifTrue:[
+            chunk := changeStream nextChunk.
+            changeStream close.
+            fullParseTree := Parser parseExpression:chunk.
+            (fullParseTree isNil or:[fullParseTree == #Error]) ifTrue:[
+                fullParseTree := nil
+            ].
+            fullParseTree isMessage ifFalse:[
+                fullParseTree := nil
+            ].
+            "/ actually, the nil case cannot happen
+            fullParseTree notNil ifTrue:[
+                aParseTree := fullParseTree.
+                sel := aParseTree selector.
+            ].
+        ].
+
+        arg1Tree := aParseTree arg1.
+        (arg1Tree notNil and:[arg1Tree isConstant]) ifTrue:[
+            name := arg1Tree value asString.
+
+            "/ is it a private-class ?
+            ('*privateIn:' match:sel) ifTrue:[
+                ownerTree := aParseTree args last.
+                ownerName := ownerTree name asString.
+                name := ownerName , '::' , name
+            ].
+            aChange className: name.
+            ^ name
+        ].
+        "very strange"
+        ^ nil
     ].
 
     "
      is it a class remove ?
     "
     (sel == #removeClass:) ifTrue:[
-	(recTree notNil
-	and:[recTree ~~ #Error
-	and:[recTree isPrimary
-	and:[recTree name = 'Smalltalk']]]) ifTrue:[
-	    arg1Tree := aParseTree arg1.
-	    (arg1Tree notNil and:[arg1Tree isPrimary]) ifTrue:[
-		name := arg1Tree name.
-		aChange className: name.
-		^ name
-	    ].
-	]
+        (recTree notNil
+        and:[recTree ~~ #Error
+        and:[recTree isPrimary
+        and:[recTree name = 'Smalltalk']]]) ifTrue:[
+            arg1Tree := aParseTree arg1.
+            (arg1Tree notNil and:[arg1Tree isPrimary]) ifTrue:[
+                name := arg1Tree name.
+                aChange className: name.
+                ^ name
+            ].
+        ]
     ].
 
     "
@@ -2718,28 +2718,30 @@
     "
     ((sel == #category:)
     or:[sel == #privacy:]) ifTrue:[
-	(recTree notNil
-	and:[recTree ~~ #Error
-	and:[recTree isMessage
-	and:[recTree selector == #compiledMethodAt:]]]) ifTrue:[
-	    isMeta := false.
-	    recTree := recTree receiver.
-	    recTree isUnaryMessage ifTrue:[
-		(recTree selector ~~ #class) ifTrue:[^ nil].
-		"id class "
-		recTree := recTree receiver
-	    ].
-	    recTree isPrimary ifTrue:[
-		isMeta ifTrue:[
-		    name := name , ' class'.
-		].
-		name := recTree name.
-		aChange className: name.
-		^ name
-	    ]
-	]
+        (recTree notNil
+        and:[recTree ~~ #Error
+        and:[recTree isMessage
+        and:[recTree selector == #compiledMethodAt:]]]) ifTrue:[
+            isMeta := false.
+            recTree := recTree receiver.
+            recTree isUnaryMessage ifTrue:[
+                (recTree selector ~~ #class) ifTrue:[^ nil].
+                "id class "
+                recTree := recTree receiver
+            ].
+            recTree isPrimary ifTrue:[
+                isMeta ifTrue:[
+                    name := name , ' class'.
+                ].
+                name := recTree name.
+                aChange className: name.
+                ^ name
+            ]
+        ]
     ].
     ^ nil
+
+    "Modified: / 17-07-2017 / 10:43:26 / cg"
 !
 
 newLabel:how
@@ -3092,7 +3094,7 @@
             ].
             modified := false.
 
-        ] valueNowOrOnUnwindDo:[
+        ] ensure:[
             aStream close.
             inBackground ifTrue:[myProcess priority:myPriority].
         ].
@@ -3106,7 +3108,7 @@
     self checkIfFileHasChanged.
 
     "Modified: / 16-11-2010 / 15:52:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 18-08-2011 / 09:45:23 / cg"
+    "Modified: / 17-07-2017 / 10:43:38 / cg"
 !
 
 selectorOfMethodChange:aChange
hg/stx-libtool