send NotFound when positional absent. Ensure there is child before checking its specification

Author: demarey

src/Clap-Core/ClapCompositeMatch.class.st

@@ -23,7 +23,7 @@ ClapCompositeMatch >> at: identifierOrSpec [
 		ifAbsent: [
 			specification at: identifierOrSpec
 				ifPresent: [ :spec | ClapImplicit of: spec in: self ]
-				ifAbsent: [ self notYetImplemented ] ]
+				ifAbsent: [ NotFound signal: 'Cannot find ' , identifierOrSpec asSymbol, '!' ] ] 	
 ]
 
 { #category : #'accessing - children' }
@@ -71,6 +71,12 @@ ClapCompositeMatch >> flags [
 	^ children select: [ :each | specification flags includes: each specification ]
 ]
 
+{ #category : #testing }
+ClapCompositeMatch >> hasChild [
+
+	^ children isNotEmpty
+]
+
 { #category : #testing }
 ClapCompositeMatch >> includesMatchOf: identifierOrSpec [
 	^ children anySatisfy: [ :arg | arg isMatchOf: identifierOrSpec ]

src/Clap-Core/ClapContext.class.st

@@ -232,6 +232,13 @@ ClapContext >> hasFlag: anIdentifier [
 		^ (self lastSubcommand occurrencesOf: anIdentifier) isNotEmpty
 ]
 
+{ #category : #private }
+ClapContext >> hasPositional: aFlagMatch [
+		
+	^ aFlagMatch hasChild 
+		and: [ aFlagMatch child specification isPositional ]
+]
+
 { #category : #activation }
 ClapContext >> hasSessionChanged [
 	^ session ~~ Smalltalk session
@@ -287,7 +294,7 @@ ClapContext >> positional: anIdentifier [
 	identifierMatches := (self lastSubcommand occurrencesOf: anIdentifier)
 		select: [ :identifierMatch | 
 			identifierMatch specification isPositional
-				or: [ identifierMatch specification isFlag and: [ identifierMatch child specification isPositional ] ] ].
+				or: [ identifierMatch specification isFlag and: [ self hasPositional: identifierMatch ] ] ].
 	^ identifierMatches
 		ifEmpty: [ NotFound signal: 'No positional found with id: ', anIdentifier  ] 
 ]