Hello community, here is the log from the commit of package coccigrep for openSUSE:Factory checked in at 2014-07-04 17:18:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/coccigrep (Old) and /work/SRC/openSUSE:Factory/.coccigrep.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "coccigrep" Changes: -------- --- /work/SRC/openSUSE:Factory/coccigrep/coccigrep.changes 2013-08-25 13:36:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.coccigrep.new/coccigrep.changes 2014-07-04 17:18:27.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 2 15:20:15 UTC 2014 - [email protected] + +- update to latest snapshot (20140217) + * see ChangeLog for changes + +------------------------------------------------------------------- Old: ---- coccigrep-20130723.tar.xz New: ---- coccigrep-20140217.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ coccigrep.spec ++++++ --- /var/tmp/diff_new_pack.A41XqJ/_old 2014-07-04 17:18:28.000000000 +0200 +++ /var/tmp/diff_new_pack.A41XqJ/_new 2014-07-04 17:18:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package coccigrep # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: coccigrep -Version: 20130723 +Version: 20140217 Release: 0 Summary: Semantic grep tool for C, based on coccinelle License: GPL-3.0 ++++++ coccigrep-20130723.tar.xz -> coccigrep-20140217.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coccigrep-20130723/ChangeLog new/coccigrep-20140217/ChangeLog --- old/coccigrep-20130723/ChangeLog 2013-08-17 21:40:17.000000000 +0200 +++ new/coccigrep-20140217/ChangeLog 2014-07-02 17:19:53.000000000 +0200 @@ -1,4 +1,17 @@ -1.11 (2012/12/22) +1.12 (2014/01/10) + * Improve accuracy (Eric Leblond) + * vim: correctly indent file (Eric Leblond) + * add match on identifier name (Eric Leblond) + * Merge pull request #11 from yhuelf/master (Eric Leblond) + * vim plugin: cosmetics (Frédéric Yhuel) + * vim plugin: allow use of "-l" option (Frédéric Yhuel) + * fix version detection (Eric Leblond) + * --version is not supported by all spatch version (Eric Leblond) + * Add structure matching example. (Eric Leblond) + * Add information about dependencies. (Eric Leblond) + * Reorder README so we see installation part (Eric Leblond) + +1.12 (2012/12/22) * Fix error handling (Eric Leblond) * Put operation in try pass. (Eric Leblond) * Don't ignore header files (Frédéric Yhuel) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coccigrep-20130723/README.rst new/coccigrep-20140217/README.rst --- old/coccigrep-20130723/README.rst 2013-08-17 21:40:17.000000000 +0200 +++ new/coccigrep-20140217/README.rst 2014-07-02 17:19:53.000000000 +0200 @@ -130,6 +130,19 @@ Please note that, in interactive mode, quoting is not necessary. +You can also set the global variable `coccigrep_files` :: + + :let g:coccigrep_files = '~/myproject/src/flist' + +where `flist` is the file corresponding to the `-l` option. +And then you can run commands like :: + + :Coccigrep Packet + :Coccigrep Packet datalink set + +That is, you don't need to provide the last argument of the previous examples. +This is particularly useful if you set vim's autochdir option. + Running coccigrep in emacs -------------------------- @@ -153,3 +166,10 @@ The matches will appear in a buffer with mode set to `grep-mode` and you will thus be able to jump on occurence. History is available on the different parameters. + +Current limitations +=================== + +- **Macros**: Coccigrep won't expand the macros for you, so code contained in them won't be matched. +- **Nested functions**: Coccinelle might not match code inside a nested function, + and so does coccigrep. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coccigrep-20130723/editors/cocci-grep.vim new/coccigrep-20140217/editors/cocci-grep.vim --- old/coccigrep-20130723/editors/cocci-grep.vim 2013-08-17 21:40:17.000000000 +0200 +++ new/coccigrep-20140217/editors/cocci-grep.vim 2014-07-02 17:19:53.000000000 +0200 @@ -47,6 +47,13 @@ let i += 1 endif endwhile + + if !exists("g:coccigrep_files") + let s:b_files_arg = 1 + else + let s:b_files_arg = 0 + endif + " if we've got " 0 args: interactive mode if len(argl) == 0 @@ -59,18 +66,25 @@ call inputrestore() let cgrep = '-V -t ' . shellescape(s:type) . ' -a ' . s:attribute . ' -o ' . s:operation . ' ' . s:files " 1 args: use files in current dir - elseif len(argl) == 1 + elseif len(argl) == (0 + s:b_files_arg) let cgrep = '-V -t ' . get(argl, 0) . ' *.[ch]' " 2 args: 'used' on first arg, second is files - elseif len(argl) == 2 - let cgrep = '-V -t ' . get(argl, 0) . ' ' . get(argl, 1) -" 3 args: 'deref' operation - elseif len(argl) == 3 - let cgrep = '-V -t ' . get(argl, 0) . ' -a ' . get(argl, 1) . ' ' . get(argl, 2) + elseif len(argl) == (1 + s:b_files_arg) + let cgrep = '-V -t ' . get(argl, 0) +" 3 args: 'deref' operation + elseif len(argl) == (2 + s:b_files_arg) + let cgrep = '-V -t ' . get(argl, 0) . ' -a ' . get(argl, 1) " 4 args: command is type - elseif len(argl) == 4 - let cgrep = '-V -t ' . get(argl, 0) . ' -a ' . get(argl, 1) . ' -o ' . get(argl, 2) . ' ' . get(argl, 3) + elseif len(argl) == (3 + s:b_files_arg) + let cgrep = '-V -t ' . get(argl, 0) . ' -a ' . get(argl, 1) . ' -o ' . get(argl, 2) + endif + + if s:b_files_arg + let cgrep = cgrep . ' ' . get(argl, len(argl)-1) + else + let cgrep = cgrep . ' -l ' . g:coccigrep_files endif + echo "Running coccigrep, please wait..." let cocciout = system(g:coccigrep_path . ' '. cgrep) if cocciout == "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coccigrep-20130723/src/coccigrep.py new/coccigrep-20140217/src/coccigrep.py --- old/coccigrep-20130723/src/coccigrep.py 2013-08-17 21:40:17.000000000 +0200 +++ new/coccigrep-20140217/src/coccigrep.py 2014-07-02 17:19:53.000000000 +0200 @@ -17,13 +17,13 @@ from ConfigParser import SafeConfigParser from os import unlink, path, listdir, getcwd from string import Template -from subprocess import Popen, PIPE +from subprocess import Popen, PIPE, STDOUT from sys import stderr from tempfile import NamedTemporaryFile import errno import re -COCCIGREP_VERSION = "1.12" +COCCIGREP_VERSION = "1.13" have_multiprocessing = True try: @@ -303,7 +303,7 @@ self.operations = {} self.process = [] self.matches = [] - self.options = [] + self.options = ["--recursive-includes"] dirList = listdir(self.get_datadir()) for fname in dirList: op = _operation_name(fname) @@ -407,7 +407,7 @@ def get_spatch_version(self): cmd = [self.spatch] + [ '-version'] try: - output = Popen(cmd, stderr=PIPE).communicate()[1] + output = Popen(cmd, stdout=PIPE, stderr=STDOUT).communicate()[0] except OSError, err: _raise_run_err(err, cmd) reg = r"version (.*?) with" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/coccigrep-20130723/src/data/named.cocci new/coccigrep-20140217/src/data/named.cocci --- old/coccigrep-20130723/src/data/named.cocci 1970-01-01 01:00:00.000000000 +0100 +++ new/coccigrep-20140217/src/data/named.cocci 2014-07-02 17:19:53.000000000 +0200 @@ -0,0 +1,6 @@ +@init@ +identifier p $cocci_regexp_equal "$type"; +position p1; +@@ + +p@p1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
