DOMjudge-devel

domjudge-devel@domjudge.org

194 discussions

Re: [DOMjudge-commits] Checktestdata branch master updated.
by Jaap Eldering 01 Jan '17

01 Jan '17

Hi Jeroen, Could you add a description or Makefile documenting how to build this? I tried to do so by installing cabal, and the required packages, but failed. I think I didn't have exactly the right versions, and even then, the Setup binary complained that none of the packages were available. Jaap On 01-01-17 10:42, DOMjudge wrote: > The branch, master has been updated > from c525f8b20c1d59e54db2b6399fb5dab9475bb903 (commit) > via c6bcd2e71281bf990b0ca9f6254236622d4ebc97 (commit) > via d7fea2aabc5ad165ce93589d47398cc99a3f0765 (commit) > > - Log ----------------------------------------------------------------- > ----------------------------------------------------------------------- > https://www.domjudge.org/gitweb/?p=checktestdata.git;a=commitdiff;h=c6bcd2e7 > commit c6bcd2e71281bf990b0ca9f6254236622d4ebc97 > Author: Jeroen Bransen <jeroen(a)chordify.net> > Date: Sun Jan 1 13:38:25 2017 +0100 > > [haskell_edsl] Add regex support > > diff --git a/haskell_edsl/checktestdata.cabal b/haskell_edsl/checktestdata.cabal > index 42babc6..9e42a30 100644 > --- a/haskell_edsl/checktestdata.cabal > +++ b/haskell_edsl/checktestdata.cabal > @@ -27,6 +27,7 @@ library > containers >=0.5 && <0.6, > either >=4.3 && <4.5, > mtl >=2.2 && <2.3, > + regex-tdfa >= 1.2, > uu-parsinglib >= 2.9 > hs-source-dirs: src > default-language: Haskell2010 > diff --git a/haskell_edsl/src/Checktestdata/Core.hs b/haskell_edsl/src/Checktestdata/Core.hs > index e3242b3..11615dc 100644 > --- a/haskell_edsl/src/Checktestdata/Core.hs > +++ b/haskell_edsl/src/Checktestdata/Core.hs > @@ -12,6 +12,7 @@ module Checktestdata.Core ( > nextHex, > nextFloat, > string, > + regex, > eof, > isEOF, > ) where > @@ -21,6 +22,9 @@ import qualified Data.ByteString.Char8 as BS > import qualified Data.ByteString.Lex.Fractional as FR > import qualified Data.ByteString.Lex.Integral as INT > > +import Text.Regex.TDFA > +import Text.Regex.TDFA.ByteString > + > import Control.Monad.State > import Control.Monad.Trans.Either > > @@ -172,6 +176,24 @@ string s = PrimOp $ do > True -> do > putRemaining $ BS.drop (length s) cs > > +-- | Match with the given regular expression > +regex :: String -> CTD String > +regex rs = PrimOp $ do > + let reg = compile defaultCompOpt defaultExecOpt $ BS.pack rs > + case reg of > + Left e -> failWithLocation e > + Right r -> do > + cs <- getRemaining > + let err = "Expression " ++ show rs ++ " does not match" > + case regexec r cs of > + Right (Just (pre,main,post,_)) -> case BS.null pre of > + True -> do > + putRemaining post > + return $ BS.unpack main > + False -> failWithLocation err > + Left e -> failWithLocation e > + Right _ -> failWithLocation err > + > -- | Check whether we are at the end of the file. > isEOF :: CTD Bool > isEOF = PrimOp $ do > > ----------------------------------------------------------------------- > https://www.domjudge.org/gitweb/?p=checktestdata.git;a=commitdiff;h=d7fea2aa > commit d7fea2aabc5ad165ce93589d47398cc99a3f0765 > Author: Jeroen Bransen <jeroen(a)chordify.net> > Date: Sun Jan 1 13:40:02 2017 +0100 > > [haskell_edsl] Almost complete backwards compatibility, passes most tests > > diff --git a/haskell_edsl/src/Checktestdata/Script/AST.hs b/haskell_edsl/src/Checktestdata/Script/AST.hs > index f116515..7542c24 100644 > --- a/haskell_edsl/src/Checktestdata/Script/AST.hs > +++ b/haskell_edsl/src/Checktestdata/Script/AST.hs > @@ -1,5 +1,6 @@ > module Checktestdata.Script.AST ( > - Var, > + VarName, > + Var (..), > Block, > AST (..), > Expr (..), > @@ -8,9 +9,11 @@ module Checktestdata.Script.AST ( > Test (..), > CompOp (..), > ) where > --- data Var = Var String [Expr] > > -type Var = String > +type VarName = String > + > +data Var = Var VarName [Expr] > + deriving ( Show ) > > type Block = [AST] > > @@ -20,11 +23,12 @@ data AST = CSpace > | CInt Expr Expr (Maybe Var) > | CFloat Expr Expr (Maybe Var) (Maybe FloatOption) > | CString Expr > + | CRegex Expr (Maybe Var) > | CRep (Maybe Var) Expr (Maybe AST) Block -- var, count, separator, body > | CWhile (Maybe Var) Test (Maybe AST) Block > | CAssert Test > | CSet [(Var, Expr)] > - | CUnset [Var] > + | CUnset [VarName] > | CIf Test Block (Maybe Block) > deriving (Show) > > @@ -54,8 +58,8 @@ data Test = Not Test > | And Test Test > | Or Test Test > | Match Expr > - | Unique [Var] > - | InArray Expr Var > + | Unique [VarName] > + | InArray Expr VarName > | IsEOF > deriving (Show) > > diff --git a/haskell_edsl/src/Checktestdata/Script/Interpreter.hs b/haskell_edsl/src/Checktestdata/Script/Interpreter.hs > index c74c9a9..8013e09 100644 > --- a/haskell_edsl/src/Checktestdata/Script/Interpreter.hs > +++ b/haskell_edsl/src/Checktestdata/Script/Interpreter.hs > @@ -8,6 +8,7 @@ import Checktestdata.Core > import Checktestdata.Derived > import Checktestdata.Script.AST > > +import Data.List ( genericLength, transpose ) > import Data.Map ( Map ) > import qualified Data.Map as Map > > @@ -19,26 +20,32 @@ import Control.Monad.State > -------------------------------------------------------------------------------- > > -- todo: error handling on script parsing level > --- todo: arrays > > data Value = VInt Integer > | VFloat Rational > | VString String > + deriving ( Show, Eq, Ord ) > > -type ValueMap = Map Var Value > +type ValueMap = Map VarName (Map [Value] Value) > > setValue :: Maybe Var -> Value -> InterpretMonad () > setValue Nothing _ = return () > -setValue (Just var) val = modify $ Map.insert var val > +setValue (Just (Var var eidxs)) val = do > + idxs <- mapM fExpr eidxs > + modify $ Map.insertWith Map.union var $ Map.singleton idxs val > > getValue :: Var -> InterpretMonad Value > -getValue var = do > +getValue (Var var eidxs) = do > vm <- get > case Map.lookup var vm of > - Nothing -> error $ "Undefined variable " ++ var > - Just val -> return val > - > -unsetVar :: Var -> InterpretMonad () > + Nothing -> error $ "Undefined variable " ++ show var > + Just vmi -> do > + idxs <- mapM fExpr eidxs > + case Map.lookup idxs vmi of > + Nothing -> error $ "Undefined index " ++ show idxs > + Just val -> return val > + > +unsetVar :: VarName -> InterpretMonad () > unsetVar var = modify $ Map.delete var > > toInt :: Value -> InterpretMonad Integer > @@ -66,133 +73,158 @@ liftC = lift > > -- | Interpret an old checktestdata script into an executable 'CTD' > interpret :: Block -> CTD () > -interpret = flip evalStateT Map.empty . fBlock where > +interpret = flip evalStateT Map.empty . fBlock > + > -- Code blocks (simple fold) > - fBlock :: Block -> InterpretMonad () > - fBlock = mapM_ fAST > - > - -- AST elements > - fAST :: AST -> InterpretMonad () > - fAST CSpace = liftC space > - fAST CNewline = liftC newline > - fAST CEOF = liftC eof > - fAST (CSet vs) = forM_ vs $ \(var,e) -> do > - val <- fExpr e > - setValue (Just var) val > - fAST (CUnset vs) = mapM_ unsetVar vs > - fAST (CInt low up var) = do > - vlow <- fExpr low >>= toInt > - vup <- fExpr up >>= toInt > - val <- liftC $ int vlow vup > - setValue var (VInt val) > - fAST (CFloat low up var _) = do -- todo: scientific/fixed option > - vlow <- fExpr low >>= toFloat > - vup <- fExpr up >>= toFloat > - val <- liftC $ float vlow vup > - setValue var (VFloat val) > - fAST (CString s) = do > - str <- fExpr s >>= toString > - liftC $ string str > - fAST (CAssert test) = do > - b <- fTest test > - liftC $ assert b > - fAST (CRep var count mbSep body) = do > - vcount <- fExpr count >>= toInt > - forM_ [0..vcount-1] $ \i -> do > - -- Parse separator > - case mbSep of > - Just sep | i > 0 -> fAST sep > - _ -> return () > - > - -- Set iterator > - setValue var (VInt i) > +fBlock :: Block -> InterpretMonad () > +fBlock = mapM_ fAST > + > +-- AST elements > +fAST :: AST -> InterpretMonad () > +fAST CSpace = liftC space > +fAST CNewline = liftC newline > +fAST CEOF = liftC eof > +fAST (CSet vs) = forM_ vs $ \(var,e) -> do > + val <- fExpr e > + setValue (Just var) val > +fAST (CUnset vs) = mapM_ unsetVar vs > +fAST (CInt low up var) = do > + vlow <- fExpr low >>= toInt > + vup <- fExpr up >>= toInt > + val <- liftC $ int vlow vup > + setValue var (VInt val) > +fAST (CFloat low up var _) = do -- todo: scientific/fixed option > + vlow <- fExpr low >>= toFloat > + vup <- fExpr up >>= toFloat > + val <- liftC $ float vlow vup > + setValue var (VFloat val) > +fAST (CString s) = do > + str <- fExpr s >>= toString > + liftC $ string str > +fAST (CRegex sr var) = do > + r <- fExpr sr >>= toString > + val <- liftC $ regex r > + setValue var (VString val) > +fAST (CAssert test) = do > + b <- fTest test > + liftC $ assert b > +fAST (CRep var count mbSep body) = do > + vcount <- fExpr count >>= toInt > + forM_ [0..vcount-1] $ \i -> do > + -- Parse separator > + case mbSep of > + Just sep | i > 0 -> fAST sep > + _ -> return () > > - -- Do the body > - fBlock body > - fAST (CWhile var test mbSep body) = do > - let it :: Integer -> InterpretMonad () > - it i = do > - setValue var (VInt i) > - b <- fTest test > - when b $ do > - -- Condition true, so parse separator > - case mbSep of > - Just sep | i > 0 -> fAST sep > - _ -> return () > - -- And parse body > - fBlock body > - -- And repeat > - it $ i + 1 > - it 0 > - fAST (CIf test ifTrue mbIfFalse) = do > - b <- fTest test > - if b then fBlock ifTrue > - else case mbIfFalse of > - Nothing -> return () > - Just bl -> fBlock bl > - > - -- Expression evaluation > - fExpr :: Expr -> InterpretMonad Value > - fExpr (EVar var) = getValue var > - fExpr (ConstI v) = return $ VInt v > - fExpr (ConstF v) = return $ VFloat v > - fExpr (ConstS v) = return $ VString v > - fExpr (Negate e) = do > - val <- fExpr e > - case val of > - VInt v -> return $ VInt $ negate v > - VFloat v -> return $ VFloat $ negate v > - _ -> error "Integer of float expected" > - fExpr (BinOp op e1 e2) = do > - v1 <- fExpr e1 > - v2 <- fExpr e2 > - fBinOp op v1 v2 > - > - -- Binary operators > - fBinOp :: BinOp -> Value -> Value -> InterpretMonad Value > - fBinOp Plus v1 v2 = fNumOp (+) v1 v2 > - fBinOp Minus v1 v2 = fNumOp (-) v1 v2 > - fBinOp Times v1 v2 = fNumOp (*) v1 v2 > - fBinOp Div v1 v2 = case (v1, v2) of > - (VInt i1, VInt i2) -> return $ VInt $ i1 `div` i2 > - _ -> do > - f1 <- toFloat v1 > - f2 <- toFloat v2 > - return $ VFloat $ f1 / f2 > - fBinOp Modulo v1 v2 = do > - i1 <- toInt v1 > - i2 <- toInt v2 > - return $ VInt $ i1 `mod` i2 > - fBinOp Pow v1 v2 = do > - i2 <- toInt v2 > - case v1 of > - VInt i1 -> return $ VInt $ i1 ^ i2 > - VFloat f1 -> return $ VFloat $ f1 ^^ i2 > - _ -> error "Integer of float expected" > - > - fNumOp :: (forall a. Num a => a -> a -> a) -> Value -> Value -> InterpretMonad Value > - fNumOp op v1 v2 = case (v1, v2) of > - (VInt i1, VInt i2) -> return $ VInt $ i1 `op` i2 > - _ -> do > - f1 <- toFloat v1 > - f2 <- toFloat v2 > - return $ VFloat $ f1 `op` f2 > - > - fTest :: Test -> InterpretMonad Bool > - fTest IsEOF = liftC isEOF > - fTest (Not test) = liftM not (fTest test) > - fTest (And t1 t2) = liftM2 (&&) (fTest t1) (fTest t2) > - fTest (Or t1 t2) = liftM2 (||) (fTest t1) (fTest t2) > - fTest (CompOp cmp e1 e2) = do > - v1 <- fExpr e1 >>= toFloat -- note that Float here is also exact > - v2 <- fExpr e2 >>= toFloat > - let Just op = cmp `lookup` [ (CompGT, (>)) > - , (CompGE, (>=)) > - , (CompEQ, (==)) > - , (CompNE, (/=)) > - , (CompLT, (<)) > - , (CompLE, (<=)) ] > - return $ v1 `op` v2 > - fTest (Match e) = do > - s <- fExpr e >>= toString > - liftC $ match s > + -- Set iterator > + setValue var (VInt i) > + > + -- Do the body > + fBlock body > +fAST (CWhile var test mbSep body) = do > + let it :: Integer -> InterpretMonad () > + it i = do > + setValue var (VInt i) > + b <- fTest test > + when b $ do > + -- Condition true, so parse separator > + case mbSep of > + Just sep | i > 0 -> fAST sep > + _ -> return () > + -- And parse body > + fBlock body > + -- And repeat > + it $ i + 1 > + it 0 > +fAST (CIf test ifTrue mbIfFalse) = do > + b <- fTest test > + if b then fBlock ifTrue > + else case mbIfFalse of > + Nothing -> return () > + Just bl -> fBlock bl > + > +-- Expression evaluation > +fExpr :: Expr -> InterpretMonad Value > +fExpr (EVar var) = getValue var > +fExpr (ConstI v) = return $ VInt v > +fExpr (ConstF v) = return $ VFloat v > +fExpr (ConstS v) = return $ VString v > +fExpr (StrLen e) = do > + val <- fExpr e >>= toString > + return $ VInt $ genericLength val > +fExpr (Negate e) = do > + val <- fExpr e > + case val of > + VInt v -> return $ VInt $ negate v > + VFloat v -> return $ VFloat $ negate v > + _ -> error "Integer of float expected" > +fExpr (BinOp op e1 e2) = do > + v1 <- fExpr e1 > + v2 <- fExpr e2 > + fBinOp op v1 v2 > + > +-- Binary operators > +fBinOp :: BinOp -> Value -> Value -> InterpretMonad Value > +fBinOp Plus v1 v2 = fNumOp (+) v1 v2 > +fBinOp Minus v1 v2 = fNumOp (-) v1 v2 > +fBinOp Times v1 v2 = fNumOp (*) v1 v2 > +fBinOp Div v1 v2 = case (v1, v2) of > + (VInt i1, VInt i2) -> return $ VInt $ i1 `div` i2 > + _ -> do > + f1 <- toFloat v1 > + f2 <- toFloat v2 > + return $ VFloat $ f1 / f2 > +fBinOp Modulo v1 v2 = do > + i1 <- toInt v1 > + i2 <- toInt v2 > + return $ VInt $ i1 `mod` i2 > +fBinOp Pow v1 v2 = do > + i2 <- toInt v2 > + case v1 of > + VInt i1 -> return $ VInt $ i1 ^ i2 > + VFloat f1 -> return $ VFloat $ f1 ^^ i2 > + _ -> error "Integer of float expected" > + > +fNumOp :: (forall a. Num a => a -> a -> a) -> Value -> Value -> InterpretMonad Value > +fNumOp op v1 v2 = case (v1, v2) of > + (VInt i1, VInt i2) -> return $ VInt $ i1 `op` i2 > + _ -> do > + f1 <- toFloat v1 > + f2 <- toFloat v2 > + return $ VFloat $ f1 `op` f2 > + > +fTest :: Test -> InterpretMonad Bool > +fTest IsEOF = liftC isEOF > +fTest (Not test) = liftM not (fTest test) > +fTest (And t1 t2) = liftM2 (&&) (fTest t1) (fTest t2) > +fTest (Or t1 t2) = liftM2 (||) (fTest t1) (fTest t2) > +fTest (Unique vs) = do > + vm <- get > + keyvals <- forM vs $ \v -> do > + let mp = Map.findWithDefault (error $ "Undefined variable " ++ v) v vm > + let (keys, vals) = unzip $ Map.toList mp > + return (keys, vals) > + let (k:ks, vals) = unzip keyvals > + let pairs = transpose vals > + when (any (/=k) ks) $ liftC $ fail "Different sets of indices" > + return $ unique pairs > +fTest (InArray val var) = do > + vm <- get > + case Map.lookup var vm of > + Nothing -> liftC $ fail $ "Undefined variable " ++ var > + Just vals -> do > + v <- fExpr val > + return $ v `elem` Map.elems vals > +fTest (CompOp cmp e1 e2) = do > + v1 <- fExpr e1 >>= toFloat -- note that Float here is also exact > + v2 <- fExpr e2 >>= toFloat > + let Just op = cmp `lookup` [ (CompGT, (>)) > + , (CompGE, (>=)) > + , (CompEQ, (==)) > + , (CompNE, (/=)) > + , (CompLT, (<)) > + , (CompLE, (<=)) ] > + return $ v1 `op` v2 > +fTest (Match e) = do > + s <- fExpr e >>= toString > + liftC $ match s > diff --git a/haskell_edsl/src/Checktestdata/Script/Parser.hs b/haskell_edsl/src/Checktestdata/Script/Parser.hs > index 125ce40..5618432 100644 > --- a/haskell_edsl/src/Checktestdata/Script/Parser.hs > +++ b/haskell_edsl/src/Checktestdata/Script/Parser.hs > @@ -6,11 +6,6 @@ module Checktestdata.Script.Parser ( > > import Checktestdata.Script.AST > > ---import Text.ParserCombinators.Parsec > ---import Text.ParserCombinators.Parsec.Language > ---import Text.ParserCombinators.Parsec.Expr > ---import qualified Text.ParserCombinators.Parsec.Token as Token > - > import Data.Char > import Data.Ratio > > @@ -25,12 +20,24 @@ import Text.ParserCombinators.UU.Utils > parseScript :: FilePath -> IO Block > parseScript fp = do > contents <- readFile fp > - case execParser (pSpaces *> pBlock) (dropComments contents) of > - (r, []) -> return r > - (r, err) -> mapM_ print err >> return r > + return $ runParser fp (pSpaces *> pBlock) (dropComments contents) > > +-- | Remove all comments from the text. This is less trivial than it seems > +-- as # may also be inside a string literal. > dropComments :: String -> String > -dropComments = unlines . map (takeWhile (/='#')) . lines > +dropComments = f False False where > + f :: Bool -> Bool -> String -> String -- inComment, inString > + f _ _ "" = "" > + f True False ('\n':xs) = '\n' : f False False xs > + f True False ( _:xs) = f True False xs > + f False True ('\\':x:xs) = '\\' : x : f False True xs > + f False True ('"' :xs) = '"' : f False False xs > + f False True ( x:xs) = x : f False True xs > + f False False ('"' :xs) = '"' : f False True xs > + f False False ('#' :xs) = f True False xs > + f False False ( x:xs) = x : f False False xs > + f _ _ _ = error "dropComments: invariant failed" > + > > -------------------------------------------------------------------------------- > -- Parsing > @@ -48,19 +55,19 @@ pAST = CSpace <$ pSymbol "SPACE" > <*> pExpr > <* pComma > <*> pExpr > - <*> (Just <$ pComma <*> identifier <<|> pure Nothing) > + <*> (Just <$ pComma <*> pVar <<|> pure Nothing) > <* pRParen > <<|> CFloat <$ pSymbol "FLOAT" > <* pLParen > <*> pExpr > <* pComma > <*> pExpr > - <*> (Just <$ pComma <*> identifier <<|> pure Nothing) > + <*> (Just <$ pComma <*> pVar <<|> pure Nothing) > <*> (Just <$ pComma <*> pFloatOption <<|> pure Nothing) > <* pRParen > <<|> CRep <$ pSymbol "REPI" > <* pLParen > - <*> (Just <$> identifier <* pComma) > + <*> (Just <$> pVar <* pComma) > <*> pExpr > <*> (Just <$ pComma <*> pAST <<|> pure Nothing) > <* pRParen > @@ -76,7 +83,7 @@ pAST = CSpace <$ pSymbol "SPACE" > <* pSymbol "END" > <<|> CWhile <$ pSymbol "WHILEI" > <* pLParen > - <*> (Just <$> identifier <* pComma) > + <*> (Just <$> pVar <* pComma) > <*> pTest > <*> (Just <$ pComma <*> pAST <<|> pure Nothing) > <* pRParen > @@ -101,6 +108,11 @@ pAST = CSpace <$ pSymbol "SPACE" > <* pLParen > <*> pTest > <* pRParen > + <<|> CRegex <$ pSymbol "REGEX" > + <* pLParen > + <*> pExpr > + <*> (Just <$ pComma <*> pVar <<|> pure Nothing) > + <* pRParen > <<|> CString <$ pSymbol "STRING" > <* pLParen > <*> pExpr > @@ -109,11 +121,15 @@ pAST = CSpace <$ pSymbol "SPACE" > <* pLParen > <*> pListSep pComma > ( > - (,) <$> identifier > - <* pSym '=' > + (,) <$> pVar > + <* lexeme (pSym '=') > <*> pExpr > ) > <* pRParen > + <<|> CUnset <$ pSymbol "UNSET" > + <* pLParen > + <*> pListSep pComma identifier > + <* pRParen > > pFloatOption :: Parser FloatOption > pFloatOption = Scientific <$ pSymbol "SCIENTIFIC" > @@ -121,12 +137,16 @@ pFloatOption = Scientific <$ pSymbol "SCIENTIFIC" > > pExpr :: Parser Expr > pExpr = foldr pChainl pExprBase (map same_prio operators) where > - same_prio ops = msum [ BinOp op <$ pSym c | (c, op) <- ops] > + same_prio ops = msum [ BinOp op <$ lexeme (pSym c) | (c, op) <- ops] > pExprBase :: Parser Expr > pExprBase = pParens pExpr > - <<|> Negate <$ pSym '-' > + <<|> Negate <$ lexeme (pSym '-') > <*> pExpr > - <<|> EVar <$> identifier > + <<|> StrLen <$ pSymbol "STRLEN" > + <* pLParen > + <*> pExpr > + <* pRParen > + <<|> EVar <$> pVar > <<|> ConstS <$> pString > <<|> lexeme pNumber > > @@ -151,6 +171,7 @@ pNumber = mkNum > mkNum i mbF mbE = ConstF $ (fromInteger i + fpart) * epart where > fpart = case mbF of > Nothing -> 0 > + Just "" -> 0 > Just f -> (read f) % (10 ^ length f) > epart = case mbE of > Nothing -> 1 > @@ -158,16 +179,31 @@ pNumber = mkNum > > -- | Parse a literal string > pString :: Parser String > -pString = lexeme $ pSym '"' *> pList pChar <* pSym '"' where > - pChar :: Parser Char -- todo: \[0-7]{1,3} denotes an octal escape for a character > - pChar = '\n' <$ pToken "\\n" > - <<|> '\t' <$ pToken "\\t" > - <<|> '\r' <$ pToken "\\r" > - <<|> '\b' <$ pToken "\\b" > - <<|> '"' <$ pToken "\\\"" > - <<|> '\\' <$ pToken "\\\\" > - <<|> pToken "\\\n" *> pSatisfy (/='"') (Insertion "x" 'x' 5) > - <<|> pSatisfy (/='"') (Insertion "x" 'x' 5) > +pString = lexeme $ pSym '"' *> pList pChar <* pSym '"' where > + pChar :: Parser Char > + pChar = pSym '\\' *> ( pOctal > + <<|> '\n' <$ pSym 'n' > + <<|> '\t' <$ pSym 't' > + <<|> '\r' <$ pSym 'r' > + <<|> '\b' <$ pSym 'b' > + <<|> '\\' <$ pSym '\\' > + <<|> '"' <$ pSym '"' > + <<|> pSym '\n' *> pChar > + <<|> pure '\\') > + <<|> pSatisfy (/='"') (Insertion "x" 'x' 5) > + pOctal :: Parser Char > + pOctal = toOct <$> octDig > + <*> (Just <$> octDig <<|> pure Nothing) > + <*> (Just <$> octDig <<|> pure Nothing) > + toOct :: Char -> Maybe Char -> Maybe Char -> Char > + toOct d1 (Just d2) (Just d3) = chr $ 64 * toNum d1 + 8 * toNum d2 + toNum d3 > + toOct d1 (Just d2) Nothing = chr $ 8 * toNum d1 + toNum d2 > + toOct d1 Nothing Nothing = chr $ toNum d1 > + toOct _ _ _ = error $ "toOct: invariant failed" > + toNum :: Char -> Int > + toNum c = ord c - ord '0' > + octDig :: Parser Char > + octDig = pSatisfy (\c -> '0' <= c && c <= '7') (Insertion "0" '0' 5) > > -- | Parse boolean expressions > pTest :: Parser Test > @@ -175,7 +211,7 @@ pTest = pChainl bOps pTestBase where > bOps = And <$ pSymbol "&&" > <<|> Or <$ pSymbol "||" > pTestBase = pParens pTest > - <<|> Not <$ pSym '!' > + <<|> Not <$ lexeme (pSym '!') > <*> pTest > <<|> IsEOF <$ pSymbol "ISEOF" > <<|> Match <$ pSymbol "MATCH" > @@ -203,9 +239,14 @@ pTest = pChainl bOps pTestBase where > ] ] > > > +-- | Parse a variable (possibly with array indices) > +pVar :: Parser Var > +pVar = Var <$> identifier > + <*> ( pLBracket *> pListSep pComma pExpr <* pRBracket <<|> pure []) > + > -------------------------------------------------------------------------------- > -- Lexing > -------------------------------------------------------------------------------- > > identifier :: Parser String > -identifier = lexeme $ (:) <$> pLetter <*> pMunch isAlphaNum > +identifier = lexeme $ (:) <$> pLower <*> pMunch (\c -> isLower c || isDigit c) > > ----------------------------------------------------------------------- > > Summary of changes: > haskell_edsl/checktestdata.cabal | 1 + > haskell_edsl/src/Checktestdata/Core.hs | 22 ++ > haskell_edsl/src/Checktestdata/Script/AST.hs | 16 +- > .../src/Checktestdata/Script/Interpreter.hs | 304 ++++++++++++--------- > haskell_edsl/src/Checktestdata/Script/Parser.hs | 101 +++++-- > 5 files changed, 272 insertions(+), 172 deletions(-) >

2 1

How to add problem to a contest
by Umair Khan 09 Dec '16

09 Dec '16

Hi, I know this seems to be a very trivial question, but I'm not getting from where do I add a problem to a contest. I have created a problem and also a contest. The contest page shows that no problems have been added to it. What am I missing? Thanks in advance, Umair

1 1

Question about Domjudge
by tfg computer 04 Nov '16

04 Nov '16

Dear Sir, Thank you very much for developing Domjudge system. I have a problem archive as attachment "test.zip". I summit right code as attachment "test.cpp". But the Domjudge system always shows "TIME LIMIT", or "PENDING". I try to run the code in windows and linux, the code works well. I still can not understand what wrong it is. Could you please help me show what wrong it is and how to solve it? Thank you very much for your help. Sincerely, Janet

2 1

Change Affiliation
by Huynh Anh Dung 20 Oct '16

20 Oct '16

Hi Jaap, Can you tell me how to change 3 letters on affiliation to more letters, I want to add more university logos on system. Best regards

3 3

Problem Import on Version 5.1.2?
by Marc Furon 10 Oct '16

10 Oct '16

I installed version 5.1.2 of DOMjudge locally for testing. I went to test the problem import process, but I do not see the problem import option on the problem page when logged in as "admin". I can add a problem manually, but I wanted to test the import functionality. Did something happen to this feature? Or is there some type of problem with my installation? Any suggestions you can provide will be appreciated. Marc

2 2

Importing accounts
by Cheng, Howard 09 Oct '16

09 Oct '16

Hi, I tried to import my accounts.tsv file which looks like this: File_Version 1 team Test Account testacct abcdefg It says that "team" is an unknown role ID. I also tried using "3" instead. What am I doing wrong? Howard -- Howard Cheng e-mail: howard.cheng(a)uleth.ca Dept of Math and CS URL : http://www.cs.uleth.ca/~cheng/ University of Lethbridge Phone : (403) 329-2182 Alberta, Canada Fax : (403) 317-2882

2 2

Multiple simultaneous contests
by Cheng, Howard 09 Oct '16

09 Oct '16

Hi, With the current version I can run multiple contests simultanenously. But I have not found a way to limit a certain subset of users/teams to one contest (i.e. I don't want users to show up on the scoreboard of the contest they are not involved in). Is there a way to do so? Howard -- Howard Cheng e-mail: howard.cheng(a)uleth.ca Dept of Math and CS URL : http://www.cs.uleth.ca/~cheng/ University of Lethbridge Phone : (403) 329-2182 Alberta, Canada Fax : (403) 317-2882

2 1

test
by Jaap Eldering 09 Oct '16

09 Oct '16

Testing whether this message arrives to the list. Please ignore. - Jaap

1 1

Judge host problem
by Huynh Anh Dung 05 Oct '16

05 Oct '16

Hi Jaap, I create a new judgeHost to connect domserver. When I run submitted file to new judgehost, it gave me a message: Compiling failed with exitcode 255, compiler output: sudo: unable to stat /etc/sudoers.d/sudoers-domjudge: No such file or directory sudo: unable to resolve host acm-jugde-2016 /root/domjudge/judgehost/bin/runguard: cannot start `/root/domjudge/judgehost/judgings/acm-jugde-2016/endpoint-default/executable/cpp/run': Permission denied Try `/root/domjudge/judgehost/bin/runguard --help' for more information. Please help Lec. Huỳnh Anh Dũng ACM/ICPC SUPERVISOR FPT UNIVERSITY. http://www.fpt.edu.vn

1 0

Create judge Host
by Huynh Anh Dung 05 Oct '16

05 Oct '16

Hi Jaap, I created 1 judgehost, then I use that judge to run C++, orr Java they give me a message: Compiling failed with exitcode 255, compiler output: /var/www/contest/judgehost/bin/runguard: creating cgroup: Cgroup, requested group parameter does not exist(50015) Try `/var/www/contest/judgehost/bin/runguard --help' for more information. Thanks Jaap Lec. Huỳnh Anh Dũng ACM/ICPC SUPERVISOR FPT UNIVERSITY. http://www.fpt.edu.vn -----Original Message----- From: Jaap Eldering [mailto:jaap@jaapeldering.nl] Sent: Thursday, September 22, 2016 9:13 AM To: Huynh Anh Dung <dungha(a)fpt.edu.vn>; domjudge-devel(a)domjudge.org Subject: Re: Coonect data from ICPC On 21-09-16 23:05, Huynh Anh Dung wrote: > Hi Jaap, > I did delete all teams and associated usernames, except admin and justhost. > But it is still not reset teamID . Please check my message below: did you also reset the AUTO_INCREMENT counter? Jaap > -----Original Message----- > From: Jaap Eldering [mailto:jaap@jaapeldering.nl] > Sent: Thursday, September 22, 2016 8:50 AM > To: Huynh Anh Dung <dungha(a)fpt.edu.vn>; domjudge-devel(a)domjudge.org > Subject: Re: Coonect data from ICPC > > Imported teams are automatically assigned a team ID using the MySQL auto_increment counter, and this ID is used for the associated username 'teamXXXX'. > > To reset that, you have to delete all teams (and the associated > usernames) and then reset the auto_increment counter, e.g. in phpmyadmin by running the SQL query: > > ALTER TABLE team AUTO_INCREMENT = 1 > > Jaap > > > On 21-09-16 21:36, Huynh Anh Dung wrote: >> Hi Jaap, >> Can you look at my picture, I captured from phpmyadmin. >> That can help you. >> thnaks >> >> Lec. Huỳnh Anh Dũng >> ACM/ICPC SUPERVISOR >> FPT UNIVERSITY. >> http://www.fpt.edu.vn >> >> -----Original Message----- >> From: Huynh Anh Dung [mailto:dungha@fpt.edu.vn] >> Sent: Thursday, September 22, 2016 7:26 AM >> To: 'Jaap Eldering' <jaap(a)jaapeldering.nl>; >> domjudge-devel(a)domjudge.org >> Cc: dungha(a)fpt.edu.vn >> Subject: RE: Coonect data from ICPC >> >> >> Hi jaap, >> I already fixed that problem, Please help me how can I reset team number back to team001 again. >> I use phpmyadmin. Please help how to reset teamID in mysql in phpmyadmin. >> thanks >> >> Lec. Huỳnh Anh Dũng >> ACM/ICPC SUPERVISOR >> FPT UNIVERSITY. >> http://www.fpt.edu.vn >> >> -----Original Message----- >> From: Jaap Eldering [mailto:jaap@jaapeldering.nl] >> Sent: Monday, September 19, 2016 10:16 AM >> To: Huynh Anh Dung <dungha(a)fpt.edu.vn>; domjudge-devel(a)domjudge.org >> Subject: Re: Coonect data from ICPC >> >> On 18-09-16 23:20, Huynh Anh Dung wrote: >>> Hi Jaap, >>> I am manager for sub contest in Vietnam, now I want to connect from Domjudge 5.1.1 to data, please see my attachement. >>> Thanks >> >> In the ICPC CMS on the contest dashboard (as shown in your screenshot), go to export->webservices. Then create an access token with access to CCS export and standings upload. Also note the contest ID that is part of the URL. Enter these two in DOMjudge under 'import/export' in the jury/admin interface. Also make sure you have a team category "Participants" (present by default). Then you can download the teams from the CMS by a button press. >> >> Jaap >> >> >>> -----Original Message----- >>> From: Jaap Eldering [mailto:jaap@jaapeldering.nl] >>> Sent: Monday, September 19, 2016 9:15 AM >>> To: Huynh Anh Dung <dungha(a)fpt.edu.vn>; domjudge-devel(a)domjudge.org >>> Subject: Re: Incorrect URL in DOMjudge Download Page >>> >>> On 18-09-16 22:59, Huynh Anh Dung wrote: >>>> Hi Jaap >>>> Yes please help how to connect icpc registered name with domjudge >>>> 5.1.1 Thanks >>> >>> First, if you post a new question, then please do not reply to a previous, unrelated post (I don't see how your question is related to the discussion below). >>> >>> I'm sorry, but your question is not very clear to me. Do you mean connecting to the ICPC content management system to download team data, etc? >>> >>> Please give more details of what you're trying to do and what you have already accomplished or tried. >>> >>> Jaap >>> >>> >>>> -----Original Message----- >>>> From: DOMjudge-devel [mailto:domjudge-devel-bounces@domjudge.org] >>>> On Behalf Of Jaap Eldering >>>> Sent: Sunday, July 3, 2016 7:06 PM >>>> To: domjudge-devel(a)domjudge.org >>>> Subject: Re: Incorrect URL in DOMjudge Download Page >>>> >>>> Thanks, fixed! - Jaap >>>> >>>> On 03-07-16 01:32, Malcolm Corney wrote: >>>>> Hi folks, >>>>> >>>>> >>>>> >>>>> On the DOMJudge – Download page at >>>>> https://www.domjudge.org/download you have an instruction for >>>>> adding your repository GPG key to APT but the URL in the >>>>> instruction is incorrect. Furthermore, the pipe command requires >>>>> sudo but the curl command does not. The command as currently displayed is: >>>>> >>>>> >>>>> >>>>> sudo curl -o - https://domjudge.org/repokey.asc | apt-key add - >>>>> >>>>> >>>>> >>>>> It should be: >>>>> >>>>> >>>>> >>>>> curl -o - https://www.domjudge.org/repokey.asc | sudo apt-key add >>>>> - >>>>> >>>>> >>>>> >>>>> Hope this helps someone. >>>>> >>>>> >>>>> >>>>> Malcolm Corney >>>>> >>>>> >>>>> >>>>> >>>>> >>>>> >>>>> >>>>> _______________________________________________ >>>>> DOMjudge-devel mailing list >>>>> DOMjudge-devel(a)domjudge.org >>>>> https://www.domjudge.org/mailman/listinfo/domjudge-devel >>>>> >>>> >>>> _______________________________________________ >>>> DOMjudge-devel mailing list >>>> DOMjudge-devel(a)domjudge.org >>>> https://www.domjudge.org/mailman/listinfo/domjudge-devel >>>> >>> >> >> >> > >

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

DOMjudge-devel