Conversation
|
could you please resolve the conflicts here? |
|
Sure. Also have to shorten some lines. |
tillmo
left a comment
tillmo
left a comment
There was a problem hiding this comment.
Please add more documentation.
Please resolve the todos (I have commented some, but not all).
Please add a general explanation in the style of CASL.hs.
Please merge master into this branch.
Why is RigidCASL/AS.der.hs empty?
| rawToSymbol (ASymbol s) = Just s | ||
| rawToSymbol (AKindedSymb k i) = | ||
| case k of | ||
| Sorts_kind -> Just $ Symbol i SortAsItemType |
There was a problem hiding this comment.
why is kind sort assumed here?
| PredAsItemType pt -> return $ addPred' sig' n pt | ||
| OpAsItemType ot -> return $ addOp' sig' n ot | ||
|
|
||
| addNomsToSign :: Sign e f -> Set.Set Id -> Result (Sign e f) |
There was a problem hiding this comment.
Please add a comment documenting the function (I won' repeat this comment for other functions).
| extSymbolKind t = case t of | ||
| OpAsItemType (OpType k l _) -> | ||
| case (k, l) of | ||
| (Total, []) -> "const" |
There was a problem hiding this comment.
what about partial constants? Should they really lead to "op"?
| return sig' | ||
|
|
||
| -- The function below belong in a different file. But I put them here for now. | ||
| -- TODO: The function below belong in a different file. But I put them here for now. |
There was a problem hiding this comment.
the TODO should be resolved
| cASLsen_analysis :: | ||
| (BASIC_SPEC () () (), Sign () (), FORMULA ()) -> Result (FORMULA ()) | ||
| (BASIC_SPEC () () (), Sign () (), FORMULA ()) -> | ||
| Result (FORMULA (), FORMULA ()) |
There was a problem hiding this comment.
please document the purpose of returning two formulas
| type Ana a b s f e = Mix b s f e -> a -> State (Sign f e) a | ||
|
|
||
|
|
||
| -} |
| map (\(a,b) -> mkVarTerm a b) $ (genToken "w1", st):(map (\(si, ii) -> (genToken $ "x" ++ show ii, si)) $ xs pt)) | ||
| (mkPredication (mkQualPred i $ extPt $ toPRED_TYPE pt) $ | ||
| map (\(a,b) -> mkVarTerm a b) $ (genToken "w2", st):(map (\(si, ii) -> (genToken $ "x" ++ show ii, si)) $ xs pt)) | ||
| ) $ MapSet.toPairList $ predMap sig -} |
|
|
||
| import Framework.AS | ||
|
|
||
| import Debug.Trace |
| varP :: AParser st (String, Maybe Token) | ||
| varP = {- do | ||
| (s, _) <- simpleId `separatedBy` skip | ||
| return (concat $ map show s, Nothing) |
| sep [keyword "apply" <+> pretty i, prettyLG lg $ Basic_spec bs nullRange] | ||
| Bridge s1 rs s2 _ -> fsep $ [condBraces lg s1, keyword "bridge"] | ||
| ++ map pretty rs ++ [condBraces lg s2] | ||
| HSpec _ _ _ _ -> empty |
3 participants
Test file at https://ontohub.org/forver/bufferDol.dol
implementation of HybridPartialAlgebraswithRigidsymbols (HPAR) in Hets:
CASL2SubCFOL True NoMembershipOrCastComorphisms/HPAR2CASL.hs)