suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the name munging for declared user-defined operators

Browse Source
This commit is contained in:
Neil Brown 2009-04-08 12:14:05 +00:00
parent 1e21895276
commit 1ea35c6715
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/Types.hs
View File

@ -22,7 +22,7 @@ module Types
specTypeOfName, typeOfSpec, typeOfSpec', abbrevModeOfName, underlyingType, underlyingTypeOf, stripArrayType, abbrevModeOfVariable, abbrevModeOfSpec specTypeOfName, typeOfSpec, typeOfSpec', abbrevModeOfName, underlyingType, underlyingTypeOf, stripArrayType, abbrevModeOfVariable, abbrevModeOfSpec
, isRealType, isIntegerType, isNumericType, isCaseableType, isScalarType, isDataType, isCommunicableType, isSequenceType, isMobileType , isRealType, isIntegerType, isNumericType, isCaseableType, isScalarType, isDataType, isCommunicableType, isSequenceType, isMobileType
, resolveUserType, isSafeConversion, isPreciseConversion, isImplicitConversionRain , resolveUserType, isSafeConversion, isPreciseConversion, isImplicitConversionRain
, isOperator, functionOperator, occamDefaultOperator, occamBuiltInOperatorFunctions , isOperator, functionOperator, occamDefaultOperator, occamBuiltInOperatorFunctions, occamOperatorTranslateDefault
, returnTypesOfFunction , returnTypesOfFunction
, BytesInResult(..), bytesInType, countReplicator, countStructured, computeStructured , BytesInResult(..), bytesInType, countReplicator, countStructured, computeStructured

5
frontends/ParseOccam.hs
View File

@ -405,7 +405,10 @@ findName thisN thisNT
scopeIn :: A.Name -> NameType -> A.SpecType -> A.AbbrevMode -> (Maybe A.Name, A.NameSource) -> OccParser A.Name scopeIn :: A.Name -> NameType -> A.SpecType -> A.AbbrevMode -> (Maybe A.Name, A.NameSource) -> OccParser A.Name
scopeIn n@(A.Name m s) nt specType am (munged, ns) scopeIn n@(A.Name m s) nt specType am (munged, ns)
= do n' <- maybe (makeUniqueName m s >>* A.Name m) return munged = do let s' = if isOperator s
then occamOperatorTranslateDefault s
else s
n' <- maybe (makeUniqueName m s' >>* A.Name m) return munged
let nd = A.NameDef { let nd = A.NameDef {
A.ndMeta = m, A.ndMeta = m,
A.ndName = A.nameName n', A.ndName = A.nameName n',