cgrep 6.6.30 → 6.6.32

raw patch · 5 files changed

+8/−7 lines, 5 files

Files

README.md +1/−1
cgrep.cabal +1/−1
src/CGrep/Filter.hs +1/−0
src/CGrep/Lang.hs +2/−1
src/Main.hs +3/−4

README.md view

@@ -7,7 +7,7 @@ Usage ----- -Cgrep 6.6.30. Usage: cgrep [OPTION] [PATTERN] files...+Cgrep 6.6.31. Usage: cgrep [OPTION] [PATTERN] files...  cgrep [OPTIONS] [ITEM]

cgrep.cabal view

@@ -1,6 +1,6 @@ Name:                cgrep Description:         Cgrep: a context-aware grep for source codes-Version:             6.6.30+Version:             6.6.32  Synopsis:            Command line tool Homepage:            http://awgn.github.io/cgrep/ License:             GPL-2

src/CGrep/Filter.hs view

@@ -219,6 +219,7 @@     ,   (Latex,      mkFilterFunction [("%", "\n")]  [("\"", "\"")] )     ,   (Lua,        mkFilterFunction [("--[[","--]]"), ("--", "\n")]    [("'", "'"), ("\"", "\""), ("[===[", "]===]"), ("[==[", "]==]"), ("[=[", "]=]"), ("[[", "]]") ] )     ,   (Make,       mkFilterFunction [("#", "\n")]  [("'", "'"), ("\"", "\"")] )+    ,   (Nmap,       mkFilterFunction [("--", "\n"), ("[[","]]")] [("'", "'"), ("\"", "\"")])     ,   (OCaml,      mkFilterFunction [("(*", "*)")] [("\"", "\"")] )     ,   (ObjectiveC, mkFilterFunction [("/*", "*/"), ("//", "\n")]  [("\"", "\"")] )     ,   (PHP,        mkFilterFunction [("/*", "*/"), ("//", "\n"), ("#", "\n") ]  [("'", "'"), ("\"", "\"")] )

src/CGrep/Lang.hs view

@@ -37,7 +37,7 @@  data Lang = Assembly | Awk  | C | CMake | Cabal | Chapel | Clojure | Coffee | Conf | Cpp  | Csharp | Css |             D | Dart | Elixir | Erlang | Fortran | Fsharp | Go | Haskell | Html | Idris | Java | Javascript | Kotlin |-            Latex | Lua | Make | OCaml | ObjectiveC | PHP | Perl | Python | Ruby | Scala | Shell | Swift | Tcl |+            Latex | Lua | Make | Nmap | OCaml | ObjectiveC | PHP | Perl | Python | Ruby | Scala | Shell | Swift | Tcl |             Text | VHDL | Verilog | Vim | Yaml                 deriving (Read, Show, Eq, Ord, Bounded) @@ -90,6 +90,7 @@     ,  (Latex,     [Ext "latex", Ext "tex"])     ,  (Lua,       [Ext "lua"])     ,  (Make,      [Name "Makefile", Name "makefile", Name "GNUmakefile", Ext "mk", Ext  "mak"])+    ,  (Nmap,      [Ext "nse"])     ,  (OCaml ,    [Ext "ml", Ext "mli"])     ,  (ObjectiveC,[Ext "m", Ext "mi"])     ,  (PHP,       [Ext "php", Ext "php3", Ext "php4", Ext "php5",Ext "phtml"])

src/Main.hs view

@@ -237,7 +237,6 @@  main :: IO () main = do-     -- check whether this is a terminal device      isTermIn  <- hIsTerminalDevice stdin@@ -245,7 +244,7 @@      -- read Cgrep config options -    (conf, confpath)  <- getConfig+    (conf, _)  <- getConfig      -- read command-line options @@ -288,8 +287,8 @@      -- display the configuration in use -    when (isJust confpath) $-      hPutStrLn stderr $ showBold opts ("Using '" ++ fromJust confpath ++ "' configuration file...")+    -- when (isJust confpath) $+    --    hPutStrLn stderr $ showBold opts ("Using '" ++ fromJust confpath ++ "' configuration file...")      -- load files to parse: