diff --git a/bin/extract.hs b/bin/extract.hs --- a/bin/extract.hs +++ b/bin/extract.hs @@ -1,67 +1,77 @@ {-# LANGUAGE Arrows #-} import Data.Binary (encode) -import Data.Either (partitionEithers) -import Data.List (intercalate, isInfixOf) +import Data.List (intercalate, isInfixOf, sortOn) import qualified Data.Text as Text -import Skylighting.Parser (missingIncludes, parseSyntaxDefinition) +import Skylighting.Loader (loadSyntaxesFromDir) +import Skylighting.Parser (missingIncludes) import Skylighting.Types import System.Directory import System.Environment (getArgs) import System.Exit import System.IO (hPutStrLn, stderr) import System.FilePath +import qualified Data.Map as M main :: IO () main = do createDirectoryIfMissing True $ "src" "Skylighting" "Syntax" files <- getArgs - (errs, syntaxes) <- partitionEithers <$> mapM parseSyntaxDefinition files - mapM_ (hPutStrLn stderr) errs - mapM_ writeModuleFor syntaxes + res <- case files of + [] -> return $ Left "No directory specified" + [d] -> loadSyntaxesFromDir d + _ -> return $ Left "Too many directories specified" + case res of + Left err -> hPutStrLn stderr err >> exitWith (ExitFailure 1) + Right sm -> do + let syntaxes = sortOn sShortname $ M.elems sm + mapM_ writeModuleFor syntaxes - case missingIncludes syntaxes of - [] -> return () - ns -> do - mapM_ (\(syn,dep) -> hPutStrLn stderr - ("Missing syntax definition: " ++ Text.unpack syn ++ " requires " ++ - Text.unpack dep ++ " through IncludeRules.")) ns - hPutStrLn stderr "Fatal error." - exitWith (ExitFailure 1) + case missingIncludes syntaxes of + [] -> return () + ns -> do + mapM_ (\(syn,dep) -> hPutStrLn stderr + ("Missing syntax definition: " ++ Text.unpack syn ++ + " requires " ++ + Text.unpack dep ++ " through IncludeRules.")) ns + hPutStrLn stderr "Fatal error." + exitWith (ExitFailure 1) - putStrLn "Backing up skylighting.cabal to skylighting.cabal.orig" - copyFile "skylighting.cabal" "skylighting.cabal.orig" + putStrLn "Backing up skylighting.cabal to skylighting.cabal.orig" + copyFile "skylighting.cabal" "skylighting.cabal.orig" - putStrLn "Updating module list in skylighting.cabal" - cabalLines <- lines <$> readFile "skylighting.cabal.orig" - let (top, rest) = break ("other-modules:" `isInfixOf`) cabalLines - let (_, bottom) = span ("Skylighting.Syntax." `isInfixOf`) (drop 1 rest) - let modulenames = map (\s -> "Skylighting.Syntax." ++ - Text.unpack (sShortname s)) syntaxes - let autogens = map ((replicate 23 ' ') ++) modulenames - let newcabal = unlines $ top ++ (" other-modules:" : autogens) ++ bottom - writeFile "skylighting.cabal" newcabal + putStrLn "Updating module list in skylighting.cabal" + cabalLines <- lines <$> readFile "skylighting.cabal.orig" + let (top, rest) = break ("other-modules:" `isInfixOf`) cabalLines + let (_, bottom) = span ("Skylighting.Syntax." `isInfixOf`) (drop 1 rest) + let modulenames = map (\s -> "Skylighting.Syntax." ++ + Text.unpack (sShortname s)) syntaxes + let autogens = map ((replicate 23 ' ') ++) modulenames + let newcabal = unlines $ top ++ (" other-modules:" : autogens) ++ + bottom + writeFile "skylighting.cabal" newcabal - let ssyn = "src" "Skylighting" "Syntax.hs" - putStrLn $ "Writing " ++ ssyn - writeFile ssyn $ unlines ( - [ "{-# LANGUAGE OverloadedStrings #-}" - , "-- | Provides syntax highlighting definitions." - , "-- THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT IT MANUALLY." - , "module Skylighting.Syntax (defaultSyntaxMap) where" - , "import qualified Data.Map as Map" - , "import Skylighting.Types" ] ++ - [ "import qualified " ++ m | m <- modulenames ] - ++ - [ "" - , "-- | Default mapping from short names to syntax definitions." - , "defaultSyntaxMap :: SyntaxMap" - , "defaultSyntaxMap = Map.fromList [" - ]) ++ " " ++ - (intercalate "\n ," - [" (" ++ show (Text.unpack $ sName s) ++ ", " - ++ "Skylighting.Syntax." ++ Text.unpack (sShortname s) ++ ".syntax)" - | s <- syntaxes ]) ++ " ]" + let ssyn = "src" "Skylighting" "Syntax.hs" + putStrLn $ "Writing " ++ ssyn + writeFile ssyn $ unlines ( + [ "{-# LANGUAGE OverloadedStrings #-}" + , "-- | Provides syntax highlighting definitions." + , "-- THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT IT MANUALLY." + , "module Skylighting.Syntax (defaultSyntaxMap) where" + , "import qualified Data.Map as Map" + , "import Skylighting.Types" ] ++ + [ "import qualified " ++ m | m <- modulenames ] + ++ + [ "" + , "-- | Default mapping from short names to syntax definitions." + , "defaultSyntaxMap :: SyntaxMap" + , "defaultSyntaxMap = Map.fromList [" + ]) ++ " " ++ + (intercalate "\n ," + [" (" ++ show (Text.unpack $ sName s) ++ ", " + ++ "Skylighting.Syntax." ++ Text.unpack (sShortname s) ++ + ".syntax)" + | s <- syntaxes ]) ++ " ]" writeModuleFor :: Syntax -> IO () writeModuleFor syn = do diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,43 @@ # Revision history for skylighting and skylighting-core +## 0.12 + + * Properly handle include elements in keyword lists (#124). + A number of syntaxes (e.g. typescript, scala) include keyword + lists from other syntaxe,s and previously we weren't able to + handle this. + + There are several pieces to this change. We need to store lists + where other Syntaxes can look them up, so we add an `sLists` + field to `Syntax` [API change], and modify the parser to fill this. + We change lists so that their values are not just a `Text`, but a + `ListItem` that can either be a textual value or an include directive, + specifying a `ListName` (syntax name and list name). + + The `Keyword` constructor for `Matcher` now takes, instead of a + `WordSet`, Either a `ListName` or a `WordSet` (API change). + + Skylighting.Parser now exports `resolveKeywords` (API change), + which modifies all `Keyword` matchers in a syntax so that Left + values with a `ListName` become Right values with resolved `WordSet`s. + The tokenizer applies this function automatically to the SyntaxMap + given in Config. But it is more efficient to do this conversion + just once, rather than every time `tokenize` is called. So we have + `loadSyntaxesFromDir` call it on the `SyntaxMap`. With this + optimization, there is not an appreciable performance cost to the + changes described above. + + * Skylighting.Regex: Fix bug with regexes like `a{10}b` (#133). + This requires exactly 10 a's; previously we interpreted it as + "at least 10." + + * skylighting-extract: take a directory as argument rather than files. + This allows us to use `loadSyntaxesFromDir`. + + * Update xml syntax definitions from upstream: + julia, cmake, cpp, isocpp, markdown, python, toml. + + ## 0.11 * Skylighting.Regex: Support regex subroutines (#118). For example, diff --git a/skylighting-core.cabal b/skylighting-core.cabal --- a/skylighting-core.cabal +++ b/skylighting-core.cabal @@ -1,5 +1,5 @@ name: skylighting-core -version: 0.11 +version: 0.12 synopsis: syntax highlighting library description: Skylighting is a syntax highlighting library. It derives its tokenizers from XML syntax @@ -196,6 +196,7 @@ filepath, text, binary, + containers, directory if flag(executable) buildable: True diff --git a/src/Regex/KDE/Compile.hs b/src/Regex/KDE/Compile.hs --- a/src/Regex/KDE/Compile.hs +++ b/src/Regex/KDE/Compile.hs @@ -99,7 +99,7 @@ 123 -> do let isDig x = x >= 48 && x < 58 minn <- option Nothing $ readMay . U.toString <$> A.takeWhile isDig - maxn <- option Nothing $ char ',' *> + maxn <- option minn $ char ',' *> (readMay . U.toString <$> A.takeWhile isDig) _ <- char '}' case (minn, maxn) of diff --git a/src/Skylighting/Loader.hs b/src/Skylighting/Loader.hs --- a/src/Skylighting/Loader.hs +++ b/src/Skylighting/Loader.hs @@ -12,7 +12,9 @@ import System.Directory (listDirectory, doesFileExist) import System.FilePath ((), takeExtension) import Skylighting.Types (SyntaxMap, Syntax) -import Skylighting.Parser (addSyntaxDefinition, parseSyntaxDefinition) +import Skylighting.Parser (addSyntaxDefinition, parseSyntaxDefinition, + resolveKeywords) +import qualified Data.Map as M #if !MIN_VERSION_base(4,11,0) import Data.Semigroup #endif @@ -44,7 +46,8 @@ s <- ExceptT $ loadSyntaxFromFile file return $ addSyntaxDefinition s sMap - foldM loadSyntax mempty files + sm <- foldM loadSyntax mempty files + return $ M.map (resolveKeywords sm) sm syntaxFiles :: FilePath -> IO [FilePath] syntaxFiles dir = do diff --git a/src/Skylighting/Parser.hs b/src/Skylighting/Parser.hs --- a/src/Skylighting/Parser.hs +++ b/src/Skylighting/Parser.hs @@ -1,7 +1,10 @@ {-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE TupleSections #-} module Skylighting.Parser ( parseSyntaxDefinition , parseSyntaxDefinitionFromText , addSyntaxDefinition + , resolveKeywords , missingIncludes ) where @@ -24,6 +27,7 @@ import Text.XML import qualified Control.Exception as E import Control.Monad.Except +import Control.Monad.Identity -- | Adds a syntax definition to a syntax map, -- replacing any existing definition with the same name. @@ -75,7 +79,9 @@ parseSyntaxDefinition :: FilePath -> IO (Either String Syntax) parseSyntaxDefinition fp = do bs <- BL.readFile fp - return $ parseSyntaxDefinitionFromText fp (toTextLazy bs) + case parseText def (toTextLazy bs) of + Left e -> return $ Left $ E.displayException e + Right doc -> runExceptT (documentToSyntax fp doc) where toTextLazy = TLE.decodeUtf8 . filterCRs . dropBOM dropBOM bs = @@ -89,12 +95,38 @@ parseSyntaxDefinitionFromText fp xml = case parseText def xml of Left e -> Left $ E.displayException e - Right doc -> runExcept $ documentToSyntax fp doc + Right doc -> runIdentity $ runExceptT $ documentToSyntax fp doc +-- | Resolve Keyword matchers that refer to lists; following up +-- include directives in the syntax map and producing WordSets. +resolveKeywords :: SyntaxMap -> Syntax -> Syntax +resolveKeywords sm = goSyntax + where + goSyntax syntax = syntax{ sContexts = M.map (goContext (sLists syntax)) + (sContexts syntax) } + goContext lists context = context{ cRules = map (goRule lists) + (cRules context) } + goRule lists rule = + case rMatcher rule of + Keyword kwattr (Left listname) -> + case M.lookup listname lists of + Nothing -> rule + Just lst -> rule{ rMatcher = + Keyword kwattr (Right (makeWordSet (keywordCaseSensitive kwattr) + (foldr goItem [] lst))) } + _ -> rule + + goItem (Item t) ts = t:ts + goItem (IncludeList (syntaxname,listname)) ts = + case M.lookup syntaxname sm >>= M.lookup listname . sLists of + Nothing -> ts + Just lst -> foldr goItem ts lst + -- | Parses an XML 'Document' as a 'Syntax' description. -documentToSyntax :: FilePath -- ^ used for short name +documentToSyntax :: Monad m + => FilePath -- ^ used for short name -> Document - -> Except String Syntax + -> ExceptT String m Syntax documentToSyntax fp Document{ documentRoot = rootEl } = do unless (elementName rootEl == "language") $ throwError "Root element is not language" @@ -134,6 +166,7 @@ , sExtensions = words $ map (\c -> if c == ';' then ' ' else c) $ T.unpack $ getAttrValue "extensions" rootEl + , sLists = lists , sContexts = M.fromList [(cName c, c) | c <- contexts] , sStartingContext = startingContext @@ -155,16 +188,28 @@ getTextContent el = mconcat [t | NodeContent t <- elementNodes el] -getList :: Element -> Except String (Text, [Text]) +getList :: Monad m => Element -> ExceptT String m (Text, [ListItem]) getList el = do case M.lookup "name" (elementAttributes el) of Nothing -> throwError "No name attribute on list" - Just name -> - return (name, map (T.strip . getTextContent) - (getElementsNamed "item" el)) + Just name -> (name,) <$> + mapM toListItem [el' | NodeElement el' <- elementNodes el] + where + toListItem el' = case elementName el' of + "item" -> return $ Item $ T.strip $ getTextContent el' + "include" -> do + let (syntaxname, listname) = + case T.breakOn "##" + (T.strip (getTextContent el')) of + (x ,y) | T.null y -> ("", x) + | otherwise -> (T.drop 2 y, x) + return $ IncludeList (syntaxname, listname) + x -> throwError $ "Unknown element " ++ show x ++ + " in list" -getParser :: Bool -> Text -> ItemData -> M.Map Text [Text] -> KeywordAttr - -> Text -> Element -> Except String Rule +getParser :: Monad m + => Bool -> Text -> ItemData -> M.Map Text [ListItem] -> KeywordAttr + -> Text -> Element -> ExceptT String m Rule getParser casesensitive syntaxname itemdatas lists kwattr cattr el = do let name = nameLocalName . elementName $ el let attribute = getAttrValue "attribute" el @@ -201,10 +246,7 @@ "StringDetect" -> return $ StringDetect str "WordDetect" -> return $ WordDetect str "RegExpr" -> return $ re - "keyword" -> return $ Keyword kwattr $ - maybe (makeWordSet True []) - (makeWordSet (keywordCaseSensitive kwattr)) - (M.lookup str lists) + "keyword" -> return $ Keyword kwattr (Left str) "Int" -> return $ Int "Float" -> return $ Float "HlCOct" -> return $ HlCOct @@ -237,13 +279,14 @@ } -getContext :: Bool +getContext :: Monad m + => Bool -> Text -> ItemData - -> M.Map Text [Text] + -> M.Map Text [ListItem] -> KeywordAttr -> Element - -> Except String Context + -> ExceptT String m Context getContext casesensitive syntaxname itemDatas lists kwattr el = do let name = getAttrValue "name" el let attribute = getAttrValue "attribute" el diff --git a/src/Skylighting/Tokenizer.hs b/src/Skylighting/Tokenizer.hs --- a/src/Skylighting/Tokenizer.hs +++ b/src/Skylighting/Tokenizer.hs @@ -31,6 +31,7 @@ import Debug.Trace import Skylighting.Regex import Skylighting.Types +import Skylighting.Parser (resolveKeywords) import Data.List.NonEmpty (NonEmpty((:|)), (<|), toList) #if !MIN_VERSION_base(4,11,0) import Data.Semigroup @@ -133,13 +134,17 @@ tokenize :: TokenizerConfig -> Syntax -> Text -> Either String [SourceLine] tokenize config syntax inp = eitherStack >>= \stack -> - case runTokenizerM action config (startingState stack) of + case runTokenizerM action + config{ syntaxMap = Map.map (resolveKeywords (syntaxMap config)) + (syntaxMap config) } + (startingState stack) of (_, Success ls) -> Right ls (_, Error e) -> Left e (_, Failure) -> Left "Could not tokenize code" where action = mapM tokenizeLine (zip (BS.lines (encodeUtf8 inp)) [1..]) - eitherStack = case lookupContext (sStartingContext syntax) syntax of + eitherStack = case lookupContext (sStartingContext syntax) + (resolveKeywords (syntaxMap config) syntax) of Just c -> Right $ ContextStack (c :| []) Nothing -> Left "No starting context specified" startingState stack = @@ -290,7 +295,10 @@ HlCStringChar -> withAttr attr $ parseCStringChar inp HlCChar -> withAttr attr $ parseCChar inp Float -> withAttr attr $ parseFloat inp - Keyword kwattr kws -> withAttr attr $ keyword kwattr kws inp + Keyword _kwattr (Left listname) -> + throwError $ "Keyword with unresolved list " <> show listname + Keyword kwattr (Right kws) -> + withAttr attr $ keyword kwattr kws inp StringDetect s -> withAttr attr $ stringDetect (rDynamic rule) (rCaseSensitive rule) s inp diff --git a/src/Skylighting/Types.hs b/src/Skylighting/Types.hs --- a/src/Skylighting/Types.hs +++ b/src/Skylighting/Types.hs @@ -15,6 +15,7 @@ , WordSet(..) , makeWordSet , inWordSet + , ListItem(..) , Matcher(..) , Rule(..) , Context(..) @@ -104,7 +105,8 @@ | StringDetect !Text | WordDetect !Text | RegExpr !RE - | Keyword KeywordAttr !(WordSet Text) + | Keyword !KeywordAttr (Either Text (WordSet Text)) + -- Either Left list name (unresolved) or Right wordset (resolved) | Int | Float | HlCOct @@ -143,12 +145,20 @@ instance Binary Rule +-- | A list item is either just a textual value or an included list. +-- IncludeList (x,y) includes list y from syntax with full name x. +data ListItem = Item !Text | IncludeList !(Text, Text) + deriving (Show, Eq, Ord, Read, Data, Typeable, Generic) + +instance Binary ListItem + -- | A syntax corresponds to a complete Kate syntax description. -- The 'sShortname' field is derived from the filename. data Syntax = Syntax{ sName :: !Text , sFilename :: !String , sShortname :: !Text + , sLists :: !(Map.Map Text [ListItem]) , sContexts :: !(Map.Map Text Context) , sAuthor :: !Text , sVersion :: !Text diff --git a/test/expected/abc.julia.native b/test/expected/abc.julia.native --- a/test/expected/abc.julia.native +++ b/test/expected/abc.julia.native @@ -1,7 +1,5 @@ [ [ ( KeywordTok , "function" ) - , ( NormalTok , " abc (str" ) - , ( OperatorTok , "," ) - , ( NormalTok , " list)" ) + , ( NormalTok , " abc (str, list)" ) ] , [ ( NormalTok , " " ) , ( FunctionTok , "isempty" ) @@ -23,7 +21,7 @@ , ( NormalTok , "(list)" ) ] , [ ( NormalTok , " str[" ) - , ( ControlFlowTok , "end" ) + , ( KeywordTok , "end" ) , ( NormalTok , "] " ) , ( KeywordTok , "in" ) , ( NormalTok , " list[i] " ) @@ -40,15 +38,11 @@ , ( KeywordTok , "end" ) , ( OperatorTok , "-" ) , ( FloatTok , "1" ) - , ( NormalTok , "]" ) - , ( OperatorTok , "," ) - , ( NormalTok , " " ) + , ( NormalTok , "], " ) , ( FunctionTok , "deleteat!" ) , ( NormalTok , "(" ) , ( FunctionTok , "copy" ) - , ( NormalTok , "(list)" ) - , ( OperatorTok , "," ) - , ( NormalTok , " i))]) " ) + , ( NormalTok , "(list), i))]) " ) , ( OperatorTok , "&&" ) ] , [ ( NormalTok , " " ) @@ -56,7 +50,7 @@ , ( NormalTok , " " ) , ( ConstantTok , "true" ) ] -, [ ( NormalTok , " " ) , ( KeywordTok , "end" ) ] +, [ ( NormalTok , " " ) , ( ControlFlowTok , "end" ) ] , [ ( NormalTok , " " ) , ( ConstantTok , "false" ) ] , [ ( KeywordTok , "end" ) ] ] diff --git a/test/expected/abc.scala.native b/test/expected/abc.scala.native --- a/test/expected/abc.scala.native +++ b/test/expected/abc.scala.native @@ -79,7 +79,8 @@ , ( OperatorTok , "(" ) , ( NormalTok , "faces" ) , ( OperatorTok , ":" ) - , ( NormalTok , " String" ) + , ( NormalTok , " " ) + , ( ExtensionTok , "String" ) , ( OperatorTok , ")" ) , ( NormalTok , " " ) , ( OperatorTok , "=" ) @@ -117,7 +118,7 @@ , ( NormalTok , " blocks " ) , ( OperatorTok , "=" ) , ( NormalTok , " " ) - , ( BuiltInTok , "List" ) + , ( ExtensionTok , "List" ) , ( OperatorTok , "(" ) , ( FunctionTok , "Block" ) , ( OperatorTok , "(" ) @@ -232,7 +233,8 @@ , ( OperatorTok , "(" ) , ( NormalTok , "word" ) , ( OperatorTok , ":" ) - , ( NormalTok , " String" ) + , ( NormalTok , " " ) + , ( ExtensionTok , "String" ) , ( OperatorTok , "," ) , ( NormalTok , " blocks" ) , ( OperatorTok , ":" ) @@ -251,7 +253,8 @@ , ( OperatorTok , "(" ) , ( NormalTok , "word" ) , ( OperatorTok , ":" ) - , ( NormalTok , " String" ) + , ( NormalTok , " " ) + , ( ExtensionTok , "String" ) , ( OperatorTok , "," ) , ( NormalTok , " blocks" ) , ( OperatorTok , ":" ) @@ -270,7 +273,8 @@ , ( OperatorTok , "(" ) , ( NormalTok , "word" ) , ( OperatorTok , ":" ) - , ( NormalTok , " String" ) + , ( NormalTok , " " ) + , ( ExtensionTok , "String" ) , ( OperatorTok , "," ) , ( NormalTok , " toCompare" ) , ( OperatorTok , ":" ) @@ -331,7 +335,7 @@ , ( NormalTok , " restant " ) , ( OperatorTok , "=" ) , ( NormalTok , " rest diff " ) - , ( BuiltInTok , "List" ) + , ( ExtensionTok , "List" ) , ( OperatorTok , "(" ) , ( NormalTok , "toCompare" ) , ( OperatorTok , "." ) @@ -413,7 +417,7 @@ , ( NormalTok , " words " ) , ( OperatorTok , "=" ) , ( NormalTok , " " ) - , ( BuiltInTok , "List" ) + , ( ExtensionTok , "List" ) , ( OperatorTok , "(" ) , ( StringTok , "\"A\"" ) , ( OperatorTok , "," ) diff --git a/test/test-skylighting.hs b/test/test-skylighting.hs --- a/test/test-skylighting.hs +++ b/test/test-skylighting.hs @@ -270,6 +270,10 @@ [ (".", "aab", Just ("a", [])) , ("ab", "aab", Nothing) , ("ab", "abb", Just ("ab", [])) + , ("a{2}b", "aaab", Nothing) + , ("a{2,}b", "aaab", Just ("aaab", [])) + , ("a{2,3}b", "aab", Just ("aab", [])) + , ("a{2,3}b", "aaab", Just ("aaab", [])) , ("a(b)", "abb", Just ("ab", [(1,"b")])) , ("a(b.)*", "abbbcb", Just ("abbbc", [(1,"bc")])) , ("a(?:b.)*", "abbbcb", Just ("abbbc", [])) diff --git a/xml/cmake.xml b/xml/cmake.xml --- a/xml/cmake.xml +++ b/xml/cmake.xml @@ -22,7 +22,7 @@ MSVC_TOOLSET_VERSION MSVC_VERSION PACKAGE_FIND_NAME - PACKAGE_FIND_VERSION + PACKAGE_FIND_VERSION_COMPLETE PACKAGE_FIND_VERSION_COUNT - PACKAGE_FIND_VERSION_MAJOR - PACKAGE_FIND_VERSION_MINOR - PACKAGE_FIND_VERSION_PATCH - PACKAGE_FIND_VERSION_TWEAK + PACKAGE_FIND_VERSION_MAX + PACKAGE_FIND_VERSION_MAX_COUNT + PACKAGE_FIND_VERSION_MAX_MAJOR + PACKAGE_FIND_VERSION_MAX_MINOR + PACKAGE_FIND_VERSION_MAX_PATCH + PACKAGE_FIND_VERSION_MAX_TWEAK + PACKAGE_FIND_VERSION_MIN + PACKAGE_FIND_VERSION_MIN_COUNT + PACKAGE_FIND_VERSION_MIN_MAJOR + PACKAGE_FIND_VERSION_MIN_MINOR + PACKAGE_FIND_VERSION_MIN_PATCH + PACKAGE_FIND_VERSION_MIN_TWEAK + PACKAGE_FIND_VERSION_RANGE + PACKAGE_FIND_VERSION_RANGE_MAX + PACKAGE_FIND_VERSION_RANGE_MIN PACKAGE_VERSION PACKAGE_VERSION_COMPATIBLE PACKAGE_VERSION_EXACT @@ -4022,7 +4033,7 @@ - + diff --git a/xml/cpp.xml b/xml/cpp.xml --- a/xml/cpp.xml +++ b/xml/cpp.xml @@ -11,7 +11,7 @@ Q_DECLARE_ASSOCIATIVE_CONTAINER_METATYPE Q_DECLARE_METATYPE @@ -80,6 +81,8 @@ QT_RESTRICTED_CAST_FROM_ASCII QT_NO_URL_CAST_FROM_STRING QT_USE_QSTRINGBUILDER + Q_DECLARE_FLAGS + Q_DECLARE_OPERATORS_FOR_FLAGS QBENCHMARK QBENCHMARK_ONCE diff --git a/xml/isocpp.xml b/xml/isocpp.xml --- a/xml/isocpp.xml +++ b/xml/isocpp.xml @@ -24,7 +24,7 @@ - - - - - + + + + + @@ -538,14 +538,14 @@ - + - + - + - + @@ -792,6 +792,8 @@ + + diff --git a/xml/julia.xml b/xml/julia.xml --- a/xml/julia.xml +++ b/xml/julia.xml @@ -36,7 +36,7 @@ ]> - + @@ -78,15 +78,10 @@ const export global - import in local macro module - typealias - importall - baremodule - using where new in @@ -95,6 +90,10 @@ ccall + + import + using + AbstractArray AbstractMatrix @@ -486,7 +485,6 @@ - @@ -497,28 +495,32 @@ - - + + + + + + + + + + - + + + + - - - - - @@ -541,69 +543,688 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -611,7 +1232,6 @@ - @@ -628,11 +1248,13 @@ - - - + + + + @@ -640,17 +1262,6 @@ - - - @@ -661,11 +1272,13 @@ + + @@ -726,16 +1339,34 @@ + + + + + + + + + + + + + + + + + + + + - - @@ -743,24 +1374,46 @@ - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + @@ -771,12 +1424,12 @@ - + diff --git a/xml/markdown.xml b/xml/markdown.xml --- a/xml/markdown.xml +++ b/xml/markdown.xml @@ -90,7 +90,7 @@ ]> - + @@ -149,14 +149,33 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/python.xml b/xml/python.xml --- a/xml/python.xml +++ b/xml/python.xml @@ -52,7 +52,7 @@ - + import @@ -90,10 +90,17 @@ try while with - yield async await + + yield + + yield from + match case @@ -380,6 +387,7 @@ + @@ -428,6 +436,11 @@ + + + + + + + + @@ -536,6 +554,7 @@ + @@ -544,22 +563,25 @@ + - + + - + + @@ -576,7 +598,7 @@ - + @@ -584,7 +606,7 @@ - + @@ -619,12 +641,14 @@ + + @@ -635,12 +659,14 @@ + + @@ -649,6 +675,7 @@ + @@ -665,12 +692,14 @@ + + @@ -681,12 +710,14 @@ + + @@ -695,6 +726,7 @@ + @@ -706,94 +738,111 @@ - + + - + + + - + + - + + + - + + - - + + + - + + - + + + - + + - + + + - - + + + - - + + + + diff --git a/xml/toml.xml b/xml/toml.xml --- a/xml/toml.xml +++ b/xml/toml.xml @@ -2,7 +2,7 @@ - + @@ -11,7 +11,7 @@ ]> - + true @@ -24,6 +24,7 @@ + @@ -41,6 +42,7 @@ + @@ -81,6 +83,9 @@ + + + @@ -96,6 +101,7 @@ +