Merge pull request #83 from tesonep/master

Preparing release v1.0.16
pharo-vcs · Mar 6, 2020 · 48a5d65 · 48a5d65
2 parents 6a71920 + 0d561e1
commit 48a5d65
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,8 +6,6 @@ os:
   - osx
 
 smalltalk:
-  - Pharo-5.0
-  - Pharo-6.0
-  - Pharo-6.1
   - Pharo-7.0
-  - Pharo64-8.0
+  - Pharo64-8.0
+  - Pharo64-9.0
diff --git a/MonticelloTonel-Core.package/TonelParser.class/instance/newStatefulTraitDefinitionFrom..st b/MonticelloTonel-Core.package/TonelParser.class/instance/newStatefulTraitDefinitionFrom..st
@@ -3,11 +3,13 @@ newStatefulTraitDefinitionFrom: anArray
 	| metadata |
 
 	metadata := anArray sixth.
+
 	^ MCTraitDefinition
 			name: (metadata at: #name)
 			traitComposition: (metadata at: #traits ifAbsent: [ '{}' ])
 			category: (metadata at: #category)
 			instVarNames: (metadata at: #instVars ifAbsent: [ #() ])
 			classInstVarNames: (metadata at: #classInstVars ifAbsent: [ #() ])
+			classTraitComposition: (metadata at: #classTraits ifAbsent: [ '{}' ])
 			comment: (anArray second ifNil: [ '' ])
 			commentStamp: nil
diff --git a/MonticelloTonel-Core.package/TonelParser.class/instance/newStatelessTraitDefinitionFrom..st b/MonticelloTonel-Core.package/TonelParser.class/instance/newStatelessTraitDefinitionFrom..st
@@ -9,6 +9,7 @@ newStatelessTraitDefinitionFrom: anArray
 	^ MCTraitDefinition
 			name: (metadata at: #name)
 			traitComposition: (metadata at: #traits ifAbsent: [ '{}' ])
+			classTraitComposition: (metadata at: #classTraits ifAbsent: [ '{}' ])
 			category: (metadata at: #category)
 			comment: (anArray second ifNil: [ '' ])
 			commentStamp: nil
diff --git a/MonticelloTonel-Core.package/TonelWriter.class/instance/writeClass..st b/MonticelloTonel-Core.package/TonelWriter.class/instance/writeClass..st
@@ -2,4 +2,4 @@ writing
 writeClass: aClassDefinition
 	[ self fileUtils writeStreamFor: (self fileNameFor: aClassDefinition) in: self packageDir do: [ :aStream | self writeClass: aClassDefinition on: aStream ] ]
 		on: TonelShouldIgnore
-		do: [ :e | self logCr: 'ignoring: ' , aClassDefinition asString ]
+		do: [ :e | self traceCr: 'ignoring: ' , aClassDefinition asString ]