Merge pull request #31 from GabinL21/clean-checker

Clean Citezen-Checking

Author: Ducasse

src/Citezen-Checking.package/CZChecker.class/README.md

@@ -17,10 +17,10 @@ It will check:
 It allows to specifie some rules (e.g. tell that the key has to be a 7-character-long word) with the messages addRule: aBlock and addRule: aBlock named: aString.
 A rule is a block with one parameter: a CZEntry.
 
-You can check your file with these 3 lines:
+You can check your file with these 2 lines:
 checker := CZChecker new.
 checker checkFile: '/Users/.../file.bib'.
-checker checks.
+
 If you compute it with "print it", you'll see the errors.
 If you don't print it, you can do at anytime by doing "print it" on that:
 checker errorString.

src/Citezen-Checking.package/CZChecker.class/instance/addRule..st

@@ -1,4 +1,3 @@
 interface
 addRule: aCZRule
-	aCZRule isNil
-		ifFalse: [ rules add: aCZRule ]
+	aCZRule ifNotNil: [ rules add: aCZRule ]

src/Citezen-Checking.package/CZChecker.class/instance/checkDuplicateField..st

@@ -2,7 +2,10 @@ as yet unclassified
 checkDuplicateField: aCZField
 	(fieldKeys includes: aCZField key)
 		ifTrue: [ 
-			errorStream nextPutAll: 'Warning: Removes duplicate field: ', aCZField key; cr.
+			errorStream 
+				nextPutAll: 'Warning: Removes duplicate field: ';
+				nextPutAll: aCZField key; 
+				cr.
 			^ false ].
 
 	fieldKeys add: aCZField key.

src/Citezen-Checking.package/CZChecker.class/instance/checkEmptyField..st

@@ -2,7 +2,10 @@ as yet unclassified
 checkEmptyField: aCZField
 	(aCZField value = '')
 		ifTrue: [ 
-			errorStream nextPutAll: 'Warning: Removes empty field: ', aCZField key; cr.
+			errorStream 
+				nextPutAll: 'Warning: Removes empty field: ';
+				nextPutAll: aCZField key;
+				cr.
 			^ false ].
 
 	^ true

src/Citezen-Checking.package/CZChecker.class/instance/checkFile..st

@@ -9,5 +9,4 @@ checkFile: aString
 
 	errorStream := WriteStream on: String new.
 	[eof] whileFalse: [ self bibtexBlockToCZEntry: self getBibtexBlock ].
-	self halt.
 	^ self checks

src/Citezen-Checking.package/CZChecker.class/instance/checkMacroReferenced..st

@@ -18,7 +18,12 @@ checkMacroReferenced: aCZField
 	macroSymbols do: [ :each |
 		(macroKeys includes: each)
 			ifFalse: [ 
-				errorStream nextPutAll: 'Warning: Removes field: ', aCZField key, ' references this undefined macro: ', each; cr.
+				errorStream 
+					nextPutAll: 'Warning: Removes field: ';
+					nextPutAll: aCZField key;
+					nextPutAll: ' references this undefined macro: ';
+					nextPutAll: each;
+					cr.
 				error := true ] ].
 
 	^ error not

src/Citezen-Checking.package/CZChecker.class/instance/checks.st

@@ -59,20 +59,27 @@ checks
 				toBeInclude := false ].
 
 		"checks if the key is unique and changes it if it's not"
-		"keys at: entry key put: ((keys at: entry key ifAbsent: 0) + 1).
+		keys at: entry key put: ((keys at: entry key ifAbsent: 0) + 1).
 		((keys at: entry key) > 1)
 			ifTrue: [ | key |
 				key := entry key.
 				entry key: '###',(entry key, '_',(keys at: entry key) asString,'###' ).
-				errorStream nextPutAll: 'Warning: duplicate key: ', key, ' changed to: ', entry key; cr.
-		error := true ]."
+				errorStream 
+					nextPutAll: 'Warning: duplicate key: ';
+					nextPutAll: key;
+					nextPutAll: ' changed to: ';
+					nextPutAll: entry key;
+					cr.
+		error := true ].
 
 		"checks if the entry respects all the rules"	
 		rules do: [ :rule |
-			"(rule value value: entry)"
 			(rule check: entry)
 				ifFalse: [
-					errorStream nextPutAll: 'Error : entry does not respect the rule: ', rule explanation; cr.
+					errorStream 
+						nextPutAll: 'Error : entry does not respect the rule: ';
+						nextPutAll: rule explanation;
+						cr.
 					error := true.
 					toBeInclude := false ] ].	
 
@@ -84,9 +91,7 @@ checks
 					nextPut: Character tab; 
 					nextPutAll: 'for :'; 
 					cr;
-					nextPutAll: "assoc value; "
-					
-					"(CZBibtexOutputer new entryToBibtexString:" entry	")";
+					nextPutAll: entry;
 					cr.
 			].
 			toBeInclude 

src/Citezen-Checking.package/CZChecker.class/properties.json

@@ -1,5 +1,5 @@
 {
-	"commentStamp" : "<historical>",
+	"commentStamp" : "GabinLaigle 12/2/2022 15:21",
 	"super" : "Object",
 	"category" : "Citezen-Checking",
 	"classinstvars" : [ ],