diff --git a/Makefile-cigraph b/Makefile-cigraph index 45e8104482f..f22194eba99 100644 --- a/Makefile-cigraph +++ b/Makefile-cigraph @@ -27,13 +27,13 @@ PARSER := $(shell cd $(top_srcdir) ; git ls-files --full-name src | \ PARSER1 := $(patsubst src/%.l, src/%.c, $(PARSER)) PARSER2 := $(patsubst src/%.y, src/%.c, $(PARSER1)) -YACC=bison -b yy -d -LEX=flex +DOCKER=docker run --rm -ti --platform linux/amd64 -v $$(pwd):/root/workspace ghcr.io/cynkra/rig-ubuntu-igraph:main +YACC=$(DOCKER) bison -b yy -d +LEX=$(DOCKER) flex %.c: %.y - $(YACC) $< - mv -f yy.tab.c src/vendor/io/$(notdir $@) - mv -f yy.tab.h src/vendor/io/parsers/$(basename $(notdir $@)).h + $(YACC) $< -o src/vendor/io/$(notdir $@) + mv -f src/vendor/io/$(basename $(notdir $@)).h src/vendor/io/parsers/$(basename $(notdir $@)).h %.c: %.l $(LEX) -o src/vendor/io/$(notdir $@) --header-file=src/vendor/io/parsers/$(basename $(notdir $@)).h $< diff --git a/rconfigure.py b/rconfigure.py index f1ef0d0a7ff..43ab358cfea 100644 --- a/rconfigure.py +++ b/rconfigure.py @@ -28,9 +28,9 @@ def generate_sources(path, name, variable, ignore = [], extensions = ('.c', '.cc continue sources.append(os.path.join(root[4:], filename[:filename.rfind('.')] + '.o')) - text = f"{variable}=" + ' '.join(sources) + '\n' + text = f"{variable}=" + ' '.join(sorted(sources)) + '\n' - with open_utf8(os.path.join('src' + path, f'{name}.mk'), 'w') as f: + with open_utf8(os.path.join('src', f'{name}.mk'), 'w') as f: f.write(text) generate_sources('/', 'sources', 'SOURCES', ignore_folders) diff --git a/src/Makevars.in b/src/Makevars.in index befcbcb7467..456a7fee633 100644 --- a/src/Makevars.in +++ b/src/Makevars.in @@ -6,7 +6,7 @@ PKG_CFLAGS=$(C_VISIBILITY) PKG_CXXFLAGS=$(CXX_VISIBILITY) PKG_FFLAGS=$(F_VISIBILITY) -PKG_CPPFLAGS=-DUSING_R -I. -Ivendor -Ivendor/cigraph/src -Ivendor/cigraph/include -Ivendor/cigraph/vendor @cflags@ \ +PKG_CPPFLAGS=-DUSING_R -I. -Ivendor -Ivendor/cigraph/src -Ivendor/cigraph/include -Ivendor/cigraph/vendor -Ivendor/io/parsers @cflags@ \ -DNDEBUG -DNTIMER -DNPRINT -DIGRAPH_THREAD_LOCAL= \ -DPRPACK_IGRAPH_SUPPORT \ -DHAVE_GFORTRAN=1 \ diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt index f2e9305864f..ea3303a3b48 100644 --- a/src/Makevars.ucrt +++ b/src/Makevars.ucrt @@ -5,7 +5,7 @@ LIB_XML ?= $(R_TOOLS_SOFT) GLPK_HOME ?= $(R_TOOLS_SOFT) LIB_GMP ?= $(R_TOOLS_SOFT) -PKG_CPPFLAGS = -I"${LIB_XML}/include/libxml2" -I"${LIB_XML}/include" -DLIBXML_STATIC -DUSING_R -I. -Ivendor -Ivendor/cigraph/src -Ivendor/cigraph/include -Ivendor/cigraph/vendor -Ivendor/mini-gmp \ +PKG_CPPFLAGS = -I"${LIB_XML}/include/libxml2" -I"${LIB_XML}/include" -DLIBXML_STATIC -DUSING_R -I. -Ivendor -Ivendor/cigraph/src -Ivendor/cigraph/include -Ivendor/cigraph/vendor -Ivendor/io/parsers -Ivendor/mini-gmp \ -DNDEBUG -DNTIMER -DNPRINT -DIGRAPH_THREAD_LOCAL= \ -DPRPACK_IGRAPH_SUPPORT \ -DHAVE_GFORTRAN=1 \ diff --git a/src/Makevars.win b/src/Makevars.win index 2bacb0418e6..a17f0a932c4 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -5,7 +5,7 @@ LIB_XML ?= $(MINGW_PREFIX) GLPK_HOME ?= $(MINGW_PREFIX) LIB_GMP ?= $(MINGW_PREFIX) -PKG_CPPFLAGS=-DUSING_R -I. -Ivendor -Ivendor/cigraph/src -Ivendor/cigraph/include -Ivendor/cigraph/vendor -Ivendor/mini-gmp \ +PKG_CPPFLAGS=-DUSING_R -I. -Ivendor -Ivendor/cigraph/src -Ivendor/cigraph/include -Ivendor/cigraph/vendor -Ivendor/io/parsers -Ivendor/mini-gmp \ -DNDEBUG -DNTIMER -DNPRINT -DIGRAPH_THREAD_LOCAL= \ -DPRPACK_IGRAPH_SUPPORT \ -DHAVE_GFORTRAN=1 \ diff --git a/src/sources-glpk.mk b/src/sources-glpk.mk index 431e03a1118..b476bf9935f 100644 --- a/src/sources-glpk.mk +++ b/src/sources-glpk.mk @@ -1 +1 @@ -GLPKSOURCES=vendor/cigraph/vendor/glpk/amd/amd_defaults.o vendor/cigraph/vendor/glpk/amd/amd_postorder.o vendor/cigraph/vendor/glpk/amd/amd_info.o vendor/cigraph/vendor/glpk/amd/amd_control.o vendor/cigraph/vendor/glpk/amd/amd_dump.o vendor/cigraph/vendor/glpk/amd/amd_valid.o vendor/cigraph/vendor/glpk/amd/amd_preprocess.o vendor/cigraph/vendor/glpk/amd/amd_aat.o vendor/cigraph/vendor/glpk/amd/amd_2.o vendor/cigraph/vendor/glpk/amd/amd_post_tree.o vendor/cigraph/vendor/glpk/amd/amd_order.o vendor/cigraph/vendor/glpk/amd/amd_1.o vendor/cigraph/vendor/glpk/api/rdsol.o vendor/cigraph/vendor/glpk/api/prob4.o vendor/cigraph/vendor/glpk/api/ckasn.o vendor/cigraph/vendor/glpk/api/rdmip.o vendor/cigraph/vendor/glpk/api/gridgen.o vendor/cigraph/vendor/glpk/api/wrmaxf.o vendor/cigraph/vendor/glpk/api/wrcc.o vendor/cigraph/vendor/glpk/api/netgen.o vendor/cigraph/vendor/glpk/api/prob2.o vendor/cigraph/vendor/glpk/api/wrmcf.o vendor/cigraph/vendor/glpk/api/maxffalg.o vendor/cigraph/vendor/glpk/api/ckcnf.o vendor/cigraph/vendor/glpk/api/cpp.o vendor/cigraph/vendor/glpk/api/mcfrelax.o vendor/cigraph/vendor/glpk/api/minisat1.o vendor/cigraph/vendor/glpk/api/wrsol.o vendor/cigraph/vendor/glpk/api/wript.o vendor/cigraph/vendor/glpk/api/advbas.o vendor/cigraph/vendor/glpk/api/wrmip.o vendor/cigraph/vendor/glpk/api/pript.o vendor/cigraph/vendor/glpk/api/mps.o vendor/cigraph/vendor/glpk/api/intfeas1.o vendor/cigraph/vendor/glpk/api/npp.o vendor/cigraph/vendor/glpk/api/cpxbas.o vendor/cigraph/vendor/glpk/api/mcflp.o vendor/cigraph/vendor/glpk/api/wrprob.o vendor/cigraph/vendor/glpk/api/rdcc.o vendor/cigraph/vendor/glpk/api/rdipt.o vendor/cigraph/vendor/glpk/api/rmfgen.o vendor/cigraph/vendor/glpk/api/wrcnf.o vendor/cigraph/vendor/glpk/api/rdmaxf.o vendor/cigraph/vendor/glpk/api/topsort.o vendor/cigraph/vendor/glpk/api/cplex.o vendor/cigraph/vendor/glpk/api/asnlp.o vendor/cigraph/vendor/glpk/api/rdprob.o vendor/cigraph/vendor/glpk/api/wcliqex.o vendor/cigraph/vendor/glpk/api/graph.o vendor/cigraph/vendor/glpk/api/wrasn.o vendor/cigraph/vendor/glpk/api/weak.o vendor/cigraph/vendor/glpk/api/rdasn.o vendor/cigraph/vendor/glpk/api/maxflp.o vendor/cigraph/vendor/glpk/api/asnokalg.o vendor/cigraph/vendor/glpk/api/rdmcf.o vendor/cigraph/vendor/glpk/api/mcfokalg.o vendor/cigraph/vendor/glpk/api/prob5.o vendor/cigraph/vendor/glpk/api/rdcnf.o vendor/cigraph/vendor/glpk/api/prrngs.o vendor/cigraph/vendor/glpk/api/prob1.o vendor/cigraph/vendor/glpk/api/prob3.o vendor/cigraph/vendor/glpk/api/mpl.o vendor/cigraph/vendor/glpk/api/strong.o vendor/cigraph/vendor/glpk/api/asnhall.o vendor/cigraph/vendor/glpk/api/prmip.o vendor/cigraph/vendor/glpk/api/prsol.o vendor/cigraph/vendor/glpk/bflib/sva.o vendor/cigraph/vendor/glpk/bflib/lufint.o vendor/cigraph/vendor/glpk/bflib/luf.o vendor/cigraph/vendor/glpk/bflib/fhv.o vendor/cigraph/vendor/glpk/bflib/scfint.o vendor/cigraph/vendor/glpk/bflib/fhvint.o vendor/cigraph/vendor/glpk/bflib/btf.o vendor/cigraph/vendor/glpk/bflib/sgf.o vendor/cigraph/vendor/glpk/bflib/btfint.o vendor/cigraph/vendor/glpk/bflib/ifu.o vendor/cigraph/vendor/glpk/bflib/scf.o vendor/cigraph/vendor/glpk/colamd/colamd.o vendor/cigraph/vendor/glpk/draft/bfd.o vendor/cigraph/vendor/glpk/draft/glpios03.o vendor/cigraph/vendor/glpk/draft/glpios09.o vendor/cigraph/vendor/glpk/draft/glpssx01.o vendor/cigraph/vendor/glpk/draft/glpios02.o vendor/cigraph/vendor/glpk/draft/glpipm.o vendor/cigraph/vendor/glpk/draft/glpios07.o vendor/cigraph/vendor/glpk/draft/glpapi10.o vendor/cigraph/vendor/glpk/draft/glpios12.o vendor/cigraph/vendor/glpk/draft/glpapi06.o vendor/cigraph/vendor/glpk/draft/glpios01.o vendor/cigraph/vendor/glpk/draft/lux.o vendor/cigraph/vendor/glpk/draft/glpapi13.o vendor/cigraph/vendor/glpk/draft/glpapi09.o vendor/cigraph/vendor/glpk/draft/glpapi08.o vendor/cigraph/vendor/glpk/draft/glpssx02.o vendor/cigraph/vendor/glpk/draft/glpscl.o vendor/cigraph/vendor/glpk/draft/bfx.o vendor/cigraph/vendor/glpk/draft/glpapi12.o vendor/cigraph/vendor/glpk/draft/glpmat.o vendor/cigraph/vendor/glpk/draft/glpios11.o vendor/cigraph/vendor/glpk/draft/glpapi07.o vendor/cigraph/vendor/glpk/env/time.o vendor/cigraph/vendor/glpk/env/error.o vendor/cigraph/vendor/glpk/env/tls.o vendor/cigraph/vendor/glpk/env/dlsup.o vendor/cigraph/vendor/glpk/env/alloc.o vendor/cigraph/vendor/glpk/env/stdout.o vendor/cigraph/vendor/glpk/env/stdc.o vendor/cigraph/vendor/glpk/env/env.o vendor/cigraph/vendor/glpk/env/stream.o vendor/cigraph/vendor/glpk/intopt/mirgen.o vendor/cigraph/vendor/glpk/intopt/covgen.o vendor/cigraph/vendor/glpk/intopt/fpump.o vendor/cigraph/vendor/glpk/intopt/cfg1.o vendor/cigraph/vendor/glpk/intopt/gmigen.o vendor/cigraph/vendor/glpk/intopt/gmicut.o vendor/cigraph/vendor/glpk/intopt/clqcut.o vendor/cigraph/vendor/glpk/intopt/cfg2.o vendor/cigraph/vendor/glpk/intopt/spv.o vendor/cigraph/vendor/glpk/intopt/cfg.o vendor/cigraph/vendor/glpk/minisat/minisat.o vendor/cigraph/vendor/glpk/misc/keller.o vendor/cigraph/vendor/glpk/misc/dmp.o vendor/cigraph/vendor/glpk/misc/mc21a.o vendor/cigraph/vendor/glpk/misc/strtrim.o vendor/cigraph/vendor/glpk/misc/rgr.o vendor/cigraph/vendor/glpk/misc/wclique1.o vendor/cigraph/vendor/glpk/misc/dimacs.o vendor/cigraph/vendor/glpk/misc/bignum.o vendor/cigraph/vendor/glpk/misc/fvs.o vendor/cigraph/vendor/glpk/misc/mygmp.o vendor/cigraph/vendor/glpk/misc/strspx.o vendor/cigraph/vendor/glpk/misc/round2n.o vendor/cigraph/vendor/glpk/misc/triang.o vendor/cigraph/vendor/glpk/misc/mc13d.o vendor/cigraph/vendor/glpk/misc/avl.o vendor/cigraph/vendor/glpk/misc/jd.o vendor/cigraph/vendor/glpk/misc/ks.o vendor/cigraph/vendor/glpk/misc/spm.o vendor/cigraph/vendor/glpk/misc/relax4.o vendor/cigraph/vendor/glpk/misc/rng1.o vendor/cigraph/vendor/glpk/misc/wclique.o vendor/cigraph/vendor/glpk/misc/str2int.o vendor/cigraph/vendor/glpk/misc/ffalg.o vendor/cigraph/vendor/glpk/misc/qmd.o vendor/cigraph/vendor/glpk/misc/rng.o vendor/cigraph/vendor/glpk/misc/hbm.o vendor/cigraph/vendor/glpk/misc/gcd.o vendor/cigraph/vendor/glpk/misc/okalg.o vendor/cigraph/vendor/glpk/misc/fp2rat.o vendor/cigraph/vendor/glpk/misc/str2num.o vendor/cigraph/vendor/glpk/misc/mt1.o vendor/cigraph/vendor/glpk/mpl/mplsql.o vendor/cigraph/vendor/glpk/mpl/mpl1.o vendor/cigraph/vendor/glpk/mpl/mpl6.o vendor/cigraph/vendor/glpk/mpl/mpl2.o vendor/cigraph/vendor/glpk/mpl/mpl3.o vendor/cigraph/vendor/glpk/mpl/mpl4.o vendor/cigraph/vendor/glpk/mpl/mpl5.o vendor/cigraph/vendor/glpk/npp/npp6.o vendor/cigraph/vendor/glpk/npp/npp1.o vendor/cigraph/vendor/glpk/npp/npp2.o vendor/cigraph/vendor/glpk/npp/npp5.o vendor/cigraph/vendor/glpk/npp/npp3.o vendor/cigraph/vendor/glpk/npp/npp4.o vendor/cigraph/vendor/glpk/proxy/proxy.o vendor/cigraph/vendor/glpk/proxy/proxy1.o vendor/cigraph/vendor/glpk/proxy/main.o vendor/cigraph/vendor/glpk/simplex/spychuzr.o vendor/cigraph/vendor/glpk/simplex/spxat.o vendor/cigraph/vendor/glpk/simplex/spychuzc.o vendor/cigraph/vendor/glpk/simplex/spxchuzr.o vendor/cigraph/vendor/glpk/simplex/spxprim.o vendor/cigraph/vendor/glpk/simplex/spxnt.o vendor/cigraph/vendor/glpk/simplex/spydual.o vendor/cigraph/vendor/glpk/simplex/spxchuzc.o vendor/cigraph/vendor/glpk/simplex/spxlp.o vendor/cigraph/vendor/glpk/simplex/spxprob.o +GLPKSOURCES=vendor/cigraph/vendor/glpk/amd/amd_1.o vendor/cigraph/vendor/glpk/amd/amd_2.o vendor/cigraph/vendor/glpk/amd/amd_aat.o vendor/cigraph/vendor/glpk/amd/amd_control.o vendor/cigraph/vendor/glpk/amd/amd_defaults.o vendor/cigraph/vendor/glpk/amd/amd_dump.o vendor/cigraph/vendor/glpk/amd/amd_info.o vendor/cigraph/vendor/glpk/amd/amd_order.o vendor/cigraph/vendor/glpk/amd/amd_post_tree.o vendor/cigraph/vendor/glpk/amd/amd_postorder.o vendor/cigraph/vendor/glpk/amd/amd_preprocess.o vendor/cigraph/vendor/glpk/amd/amd_valid.o vendor/cigraph/vendor/glpk/api/advbas.o vendor/cigraph/vendor/glpk/api/asnhall.o vendor/cigraph/vendor/glpk/api/asnlp.o vendor/cigraph/vendor/glpk/api/asnokalg.o vendor/cigraph/vendor/glpk/api/ckasn.o vendor/cigraph/vendor/glpk/api/ckcnf.o vendor/cigraph/vendor/glpk/api/cplex.o vendor/cigraph/vendor/glpk/api/cpp.o vendor/cigraph/vendor/glpk/api/cpxbas.o vendor/cigraph/vendor/glpk/api/graph.o vendor/cigraph/vendor/glpk/api/gridgen.o vendor/cigraph/vendor/glpk/api/intfeas1.o vendor/cigraph/vendor/glpk/api/maxffalg.o vendor/cigraph/vendor/glpk/api/maxflp.o vendor/cigraph/vendor/glpk/api/mcflp.o vendor/cigraph/vendor/glpk/api/mcfokalg.o vendor/cigraph/vendor/glpk/api/mcfrelax.o vendor/cigraph/vendor/glpk/api/minisat1.o vendor/cigraph/vendor/glpk/api/mpl.o vendor/cigraph/vendor/glpk/api/mps.o vendor/cigraph/vendor/glpk/api/netgen.o vendor/cigraph/vendor/glpk/api/npp.o vendor/cigraph/vendor/glpk/api/pript.o vendor/cigraph/vendor/glpk/api/prmip.o vendor/cigraph/vendor/glpk/api/prob1.o vendor/cigraph/vendor/glpk/api/prob2.o vendor/cigraph/vendor/glpk/api/prob3.o vendor/cigraph/vendor/glpk/api/prob4.o vendor/cigraph/vendor/glpk/api/prob5.o vendor/cigraph/vendor/glpk/api/prrngs.o vendor/cigraph/vendor/glpk/api/prsol.o vendor/cigraph/vendor/glpk/api/rdasn.o vendor/cigraph/vendor/glpk/api/rdcc.o vendor/cigraph/vendor/glpk/api/rdcnf.o vendor/cigraph/vendor/glpk/api/rdipt.o vendor/cigraph/vendor/glpk/api/rdmaxf.o vendor/cigraph/vendor/glpk/api/rdmcf.o vendor/cigraph/vendor/glpk/api/rdmip.o vendor/cigraph/vendor/glpk/api/rdprob.o vendor/cigraph/vendor/glpk/api/rdsol.o vendor/cigraph/vendor/glpk/api/rmfgen.o vendor/cigraph/vendor/glpk/api/strong.o vendor/cigraph/vendor/glpk/api/topsort.o vendor/cigraph/vendor/glpk/api/wcliqex.o vendor/cigraph/vendor/glpk/api/weak.o vendor/cigraph/vendor/glpk/api/wrasn.o vendor/cigraph/vendor/glpk/api/wrcc.o vendor/cigraph/vendor/glpk/api/wrcnf.o vendor/cigraph/vendor/glpk/api/wript.o vendor/cigraph/vendor/glpk/api/wrmaxf.o vendor/cigraph/vendor/glpk/api/wrmcf.o vendor/cigraph/vendor/glpk/api/wrmip.o vendor/cigraph/vendor/glpk/api/wrprob.o vendor/cigraph/vendor/glpk/api/wrsol.o vendor/cigraph/vendor/glpk/bflib/btf.o vendor/cigraph/vendor/glpk/bflib/btfint.o vendor/cigraph/vendor/glpk/bflib/fhv.o vendor/cigraph/vendor/glpk/bflib/fhvint.o vendor/cigraph/vendor/glpk/bflib/ifu.o vendor/cigraph/vendor/glpk/bflib/luf.o vendor/cigraph/vendor/glpk/bflib/lufint.o vendor/cigraph/vendor/glpk/bflib/scf.o vendor/cigraph/vendor/glpk/bflib/scfint.o vendor/cigraph/vendor/glpk/bflib/sgf.o vendor/cigraph/vendor/glpk/bflib/sva.o vendor/cigraph/vendor/glpk/colamd/colamd.o vendor/cigraph/vendor/glpk/draft/bfd.o vendor/cigraph/vendor/glpk/draft/bfx.o vendor/cigraph/vendor/glpk/draft/glpapi06.o vendor/cigraph/vendor/glpk/draft/glpapi07.o vendor/cigraph/vendor/glpk/draft/glpapi08.o vendor/cigraph/vendor/glpk/draft/glpapi09.o vendor/cigraph/vendor/glpk/draft/glpapi10.o vendor/cigraph/vendor/glpk/draft/glpapi12.o vendor/cigraph/vendor/glpk/draft/glpapi13.o vendor/cigraph/vendor/glpk/draft/glpios01.o vendor/cigraph/vendor/glpk/draft/glpios02.o vendor/cigraph/vendor/glpk/draft/glpios03.o vendor/cigraph/vendor/glpk/draft/glpios07.o vendor/cigraph/vendor/glpk/draft/glpios09.o vendor/cigraph/vendor/glpk/draft/glpios11.o vendor/cigraph/vendor/glpk/draft/glpios12.o vendor/cigraph/vendor/glpk/draft/glpipm.o vendor/cigraph/vendor/glpk/draft/glpmat.o vendor/cigraph/vendor/glpk/draft/glpscl.o vendor/cigraph/vendor/glpk/draft/glpssx01.o vendor/cigraph/vendor/glpk/draft/glpssx02.o vendor/cigraph/vendor/glpk/draft/lux.o vendor/cigraph/vendor/glpk/env/alloc.o vendor/cigraph/vendor/glpk/env/dlsup.o vendor/cigraph/vendor/glpk/env/env.o vendor/cigraph/vendor/glpk/env/error.o vendor/cigraph/vendor/glpk/env/stdc.o vendor/cigraph/vendor/glpk/env/stdout.o vendor/cigraph/vendor/glpk/env/stream.o vendor/cigraph/vendor/glpk/env/time.o vendor/cigraph/vendor/glpk/env/tls.o vendor/cigraph/vendor/glpk/intopt/cfg.o vendor/cigraph/vendor/glpk/intopt/cfg1.o vendor/cigraph/vendor/glpk/intopt/cfg2.o vendor/cigraph/vendor/glpk/intopt/clqcut.o vendor/cigraph/vendor/glpk/intopt/covgen.o vendor/cigraph/vendor/glpk/intopt/fpump.o vendor/cigraph/vendor/glpk/intopt/gmicut.o vendor/cigraph/vendor/glpk/intopt/gmigen.o vendor/cigraph/vendor/glpk/intopt/mirgen.o vendor/cigraph/vendor/glpk/intopt/spv.o vendor/cigraph/vendor/glpk/minisat/minisat.o vendor/cigraph/vendor/glpk/misc/avl.o vendor/cigraph/vendor/glpk/misc/bignum.o vendor/cigraph/vendor/glpk/misc/dimacs.o vendor/cigraph/vendor/glpk/misc/dmp.o vendor/cigraph/vendor/glpk/misc/ffalg.o vendor/cigraph/vendor/glpk/misc/fp2rat.o vendor/cigraph/vendor/glpk/misc/fvs.o vendor/cigraph/vendor/glpk/misc/gcd.o vendor/cigraph/vendor/glpk/misc/hbm.o vendor/cigraph/vendor/glpk/misc/jd.o vendor/cigraph/vendor/glpk/misc/keller.o vendor/cigraph/vendor/glpk/misc/ks.o vendor/cigraph/vendor/glpk/misc/mc13d.o vendor/cigraph/vendor/glpk/misc/mc21a.o vendor/cigraph/vendor/glpk/misc/mt1.o vendor/cigraph/vendor/glpk/misc/mygmp.o vendor/cigraph/vendor/glpk/misc/okalg.o vendor/cigraph/vendor/glpk/misc/qmd.o vendor/cigraph/vendor/glpk/misc/relax4.o vendor/cigraph/vendor/glpk/misc/rgr.o vendor/cigraph/vendor/glpk/misc/rng.o vendor/cigraph/vendor/glpk/misc/rng1.o vendor/cigraph/vendor/glpk/misc/round2n.o vendor/cigraph/vendor/glpk/misc/spm.o vendor/cigraph/vendor/glpk/misc/str2int.o vendor/cigraph/vendor/glpk/misc/str2num.o vendor/cigraph/vendor/glpk/misc/strspx.o vendor/cigraph/vendor/glpk/misc/strtrim.o vendor/cigraph/vendor/glpk/misc/triang.o vendor/cigraph/vendor/glpk/misc/wclique.o vendor/cigraph/vendor/glpk/misc/wclique1.o vendor/cigraph/vendor/glpk/mpl/mpl1.o vendor/cigraph/vendor/glpk/mpl/mpl2.o vendor/cigraph/vendor/glpk/mpl/mpl3.o vendor/cigraph/vendor/glpk/mpl/mpl4.o vendor/cigraph/vendor/glpk/mpl/mpl5.o vendor/cigraph/vendor/glpk/mpl/mpl6.o vendor/cigraph/vendor/glpk/mpl/mplsql.o vendor/cigraph/vendor/glpk/npp/npp1.o vendor/cigraph/vendor/glpk/npp/npp2.o vendor/cigraph/vendor/glpk/npp/npp3.o vendor/cigraph/vendor/glpk/npp/npp4.o vendor/cigraph/vendor/glpk/npp/npp5.o vendor/cigraph/vendor/glpk/npp/npp6.o vendor/cigraph/vendor/glpk/proxy/main.o vendor/cigraph/vendor/glpk/proxy/proxy.o vendor/cigraph/vendor/glpk/proxy/proxy1.o vendor/cigraph/vendor/glpk/simplex/spxat.o vendor/cigraph/vendor/glpk/simplex/spxchuzc.o vendor/cigraph/vendor/glpk/simplex/spxchuzr.o vendor/cigraph/vendor/glpk/simplex/spxlp.o vendor/cigraph/vendor/glpk/simplex/spxnt.o vendor/cigraph/vendor/glpk/simplex/spxprim.o vendor/cigraph/vendor/glpk/simplex/spxprob.o vendor/cigraph/vendor/glpk/simplex/spychuzc.o vendor/cigraph/vendor/glpk/simplex/spychuzr.o vendor/cigraph/vendor/glpk/simplex/spydual.o diff --git a/src/sources.mk b/src/sources.mk index c1033cbcc32..89b48e1a76b 100644 --- a/src/sources.mk +++ b/src/sources.mk @@ -1 +1 @@ -SOURCES=init.o cpp11.o rinterface_extra.o cpprinterface.o lazyeval.o rinterface.o simpleraytracer.o rrandom.o vendor/arpack/dsaitr.o vendor/arpack/dnaupd.o vendor/arpack/dstqrb.o vendor/arpack/dgetv0.o vendor/arpack/dsapps.o vendor/arpack/dngets.o vendor/arpack/dnaitr.o vendor/arpack/dnaup2.o vendor/arpack/dnconv.o vendor/arpack/dstats.o vendor/arpack/dsortc.o vendor/arpack/dneigh.o vendor/arpack/dnapps.o vendor/arpack/dneupd.o vendor/arpack/dsesrt.o vendor/arpack/dsortr.o vendor/arpack/dvout.o vendor/arpack/dsaup2.o vendor/arpack/dsconv.o vendor/arpack/wrap.o vendor/arpack/dseigt.o vendor/arpack/dlaqrb.o vendor/arpack/dmout.o vendor/arpack/dstatn.o vendor/arpack/ivout.o vendor/arpack/dsgets.o vendor/arpack/second.o vendor/arpack/dsaupd.o vendor/arpack/dseupd.o vendor/cigraph/src/version.o vendor/cigraph/src/centrality/centrality_other.o vendor/cigraph/src/centrality/centralization.o vendor/cigraph/src/centrality/hub_authority.o vendor/cigraph/src/centrality/prpack.o vendor/cigraph/src/centrality/pagerank.o vendor/cigraph/src/centrality/coreness.o vendor/cigraph/src/centrality/closeness.o vendor/cigraph/src/centrality/eigenvector.o vendor/cigraph/src/centrality/truss.o vendor/cigraph/src/centrality/betweenness.o vendor/cigraph/src/centrality/prpack/prpack_preprocessed_gs_graph.o vendor/cigraph/src/centrality/prpack/prpack_preprocessed_ge_graph.o vendor/cigraph/src/centrality/prpack/prpack_utils.o vendor/cigraph/src/centrality/prpack/prpack_igraph_graph.o vendor/cigraph/src/centrality/prpack/prpack_result.o vendor/cigraph/src/centrality/prpack/prpack_base_graph.o vendor/cigraph/src/centrality/prpack/prpack_solver.o vendor/cigraph/src/centrality/prpack/prpack_preprocessed_scc_graph.o vendor/cigraph/src/centrality/prpack/prpack_preprocessed_schur_graph.o vendor/cigraph/src/cliques/maximal_cliques.o vendor/cigraph/src/cliques/glet.o vendor/cigraph/src/cliques/cliques.o vendor/cigraph/src/cliques/cliquer_wrapper.o vendor/cigraph/src/cliques/cliquer/cliquer_graph.o vendor/cigraph/src/cliques/cliquer/reorder.o vendor/cigraph/src/cliques/cliquer/cliquer.o vendor/cigraph/src/community/louvain.o vendor/cigraph/src/community/optimal_modularity.o vendor/cigraph/src/community/leading_eigenvector.o vendor/cigraph/src/community/edge_betweenness.o vendor/cigraph/src/community/community_misc.o vendor/cigraph/src/community/leiden.o vendor/cigraph/src/community/modularity.o vendor/cigraph/src/community/label_propagation.o vendor/cigraph/src/community/fast_modularity.o vendor/cigraph/src/community/voronoi.o vendor/cigraph/src/community/fluid.o vendor/cigraph/src/community/infomap/infomap.o vendor/cigraph/src/community/infomap/infomap_Greedy.o vendor/cigraph/src/community/infomap/infomap_FlowGraph.o vendor/cigraph/src/community/spinglass/pottsmodel_2.o vendor/cigraph/src/community/spinglass/NetRoutines.o vendor/cigraph/src/community/spinglass/clustertool.o vendor/cigraph/src/community/spinglass/NetDataTypes.o vendor/cigraph/src/community/walktrap/walktrap_heap.o vendor/cigraph/src/community/walktrap/walktrap_graph.o vendor/cigraph/src/community/walktrap/walktrap_communities.o vendor/cigraph/src/community/walktrap/walktrap.o vendor/cigraph/src/connectivity/cohesive_blocks.o vendor/cigraph/src/connectivity/separators.o vendor/cigraph/src/connectivity/components.o vendor/cigraph/src/constructors/regular.o vendor/cigraph/src/constructors/de_bruijn.o vendor/cigraph/src/constructors/basic_constructors.o vendor/cigraph/src/constructors/generalized_petersen.o vendor/cigraph/src/constructors/lattices.o vendor/cigraph/src/constructors/adjacency.o vendor/cigraph/src/constructors/famous.o vendor/cigraph/src/constructors/atlas.o vendor/cigraph/src/constructors/linegraph.o vendor/cigraph/src/constructors/kautz.o vendor/cigraph/src/constructors/circulant.o vendor/cigraph/src/constructors/lcf.o vendor/cigraph/src/constructors/trees.o vendor/cigraph/src/constructors/full.o vendor/cigraph/src/constructors/prufer.o vendor/cigraph/src/core/printing.o vendor/cigraph/src/core/interruption.o vendor/cigraph/src/core/vector_ptr.o vendor/cigraph/src/core/memory.o vendor/cigraph/src/core/sparsemat.o vendor/cigraph/src/core/error.o vendor/cigraph/src/core/genheap.o vendor/cigraph/src/core/progress.o vendor/cigraph/src/core/statusbar.o vendor/cigraph/src/core/heap.o vendor/cigraph/src/core/indheap.o vendor/cigraph/src/core/grid.o vendor/cigraph/src/core/trie.o vendor/cigraph/src/core/stack.o vendor/cigraph/src/core/estack.o vendor/cigraph/src/core/buckets.o vendor/cigraph/src/core/vector_list.o vendor/cigraph/src/core/matrix_list.o vendor/cigraph/src/core/fixed_vectorlist.o vendor/cigraph/src/core/strvector.o vendor/cigraph/src/core/marked_queue.o vendor/cigraph/src/core/dqueue.o vendor/cigraph/src/core/array.o vendor/cigraph/src/core/cutheap.o vendor/cigraph/src/core/matrix.o vendor/cigraph/src/core/psumtree.o vendor/cigraph/src/core/vector.o vendor/cigraph/src/core/set.o vendor/cigraph/src/flow/flow.o vendor/cigraph/src/flow/st-cuts.o vendor/cigraph/src/flow/flow_conversion.o vendor/cigraph/src/games/growing_random.o vendor/cigraph/src/games/citations.o vendor/cigraph/src/games/establishment.o vendor/cigraph/src/games/watts_strogatz.o vendor/cigraph/src/games/tree.o vendor/cigraph/src/games/dotproduct.o vendor/cigraph/src/games/degree_sequence.o vendor/cigraph/src/games/erdos_renyi.o vendor/cigraph/src/games/static_fitness.o vendor/cigraph/src/games/preference.o vendor/cigraph/src/games/recent_degree.o vendor/cigraph/src/games/callaway_traits.o vendor/cigraph/src/games/grg.o vendor/cigraph/src/games/k_regular.o vendor/cigraph/src/games/correlated.o vendor/cigraph/src/games/barabasi.o vendor/cigraph/src/games/sbm.o vendor/cigraph/src/games/islands.o vendor/cigraph/src/games/forestfire.o vendor/cigraph/src/games/degree_sequence_vl/gengraph_graph_molloy_optimized.o vendor/cigraph/src/games/degree_sequence_vl/gengraph_degree_sequence.o vendor/cigraph/src/games/degree_sequence_vl/gengraph_graph_molloy_hash.o vendor/cigraph/src/games/degree_sequence_vl/gengraph_random.o vendor/cigraph/src/games/degree_sequence_vl/gengraph_mr-connected.o vendor/cigraph/src/graph/basic_query.o vendor/cigraph/src/graph/type_indexededgelist.o vendor/cigraph/src/graph/graph_list.o vendor/cigraph/src/graph/caching.o vendor/cigraph/src/graph/type_common.o vendor/cigraph/src/graph/adjlist.o vendor/cigraph/src/graph/cattributes.o vendor/cigraph/src/graph/attributes.o vendor/cigraph/src/graph/visitors.o vendor/cigraph/src/graph/iterators.o vendor/cigraph/src/hrg/hrg.o vendor/cigraph/src/hrg/hrg_types.o vendor/cigraph/src/internal/glpk_support.o vendor/cigraph/src/internal/hacks.o vendor/cigraph/src/internal/lsap.o vendor/cigraph/src/internal/zeroin.o vendor/cigraph/src/internal/utils.o vendor/cigraph/src/internal/qsort_r.o vendor/cigraph/src/internal/qsort.o vendor/cigraph/src/io/parse_utils.o vendor/cigraph/src/io/dl.o vendor/cigraph/src/io/edgelist.o vendor/cigraph/src/io/dimacs.o vendor/cigraph/src/io/gml.o vendor/cigraph/src/io/graphml.o vendor/cigraph/src/io/ncol.o vendor/cigraph/src/io/dot.o vendor/cigraph/src/io/lgl.o vendor/cigraph/src/io/pajek.o vendor/cigraph/src/io/leda.o vendor/cigraph/src/io/gml-tree.o vendor/cigraph/src/io/graphdb.o vendor/cigraph/src/isomorphism/lad.o vendor/cigraph/src/isomorphism/queries.o vendor/cigraph/src/isomorphism/isoclasses.o vendor/cigraph/src/isomorphism/isomorphism_misc.o vendor/cigraph/src/isomorphism/vf2.o vendor/cigraph/src/isomorphism/bliss.o vendor/cigraph/src/isomorphism/bliss/heap.o vendor/cigraph/src/isomorphism/bliss/uintseqhash.o vendor/cigraph/src/isomorphism/bliss/partition.o vendor/cigraph/src/isomorphism/bliss/graph.o vendor/cigraph/src/isomorphism/bliss/utils.o vendor/cigraph/src/isomorphism/bliss/orbit.o vendor/cigraph/src/isomorphism/bliss/defs.o vendor/cigraph/src/layout/large_graph.o vendor/cigraph/src/layout/sugiyama.o vendor/cigraph/src/layout/circular.o vendor/cigraph/src/layout/layout_bipartite.o vendor/cigraph/src/layout/graphopt.o vendor/cigraph/src/layout/fruchterman_reingold.o vendor/cigraph/src/layout/kamada_kawai.o vendor/cigraph/src/layout/davidson_harel.o vendor/cigraph/src/layout/merge_dla.o vendor/cigraph/src/layout/gem.o vendor/cigraph/src/layout/layout_random.o vendor/cigraph/src/layout/reingold_tilford.o vendor/cigraph/src/layout/merge_grid.o vendor/cigraph/src/layout/umap.o vendor/cigraph/src/layout/mds.o vendor/cigraph/src/layout/layout_grid.o vendor/cigraph/src/layout/drl/drl_graph_3d.o vendor/cigraph/src/layout/drl/drl_layout_3d.o vendor/cigraph/src/layout/drl/drl_parse.o vendor/cigraph/src/layout/drl/DensityGrid_3d.o vendor/cigraph/src/layout/drl/drl_layout.o vendor/cigraph/src/layout/drl/DensityGrid.o vendor/cigraph/src/layout/drl/drl_graph.o vendor/cigraph/src/linalg/eigen.o vendor/cigraph/src/linalg/lapack.o vendor/cigraph/src/linalg/arpack.o vendor/cigraph/src/linalg/blas.o vendor/cigraph/src/math/utils.o vendor/cigraph/src/math/safe_intop.o vendor/cigraph/src/math/complex.o vendor/cigraph/src/misc/degree_sequence.o vendor/cigraph/src/misc/feedback_arc_set.o vendor/cigraph/src/misc/cocitation.o vendor/cigraph/src/misc/scan.o vendor/cigraph/src/misc/embedding.o vendor/cigraph/src/misc/power_law_fit.o vendor/cigraph/src/misc/cycle_bases.o vendor/cigraph/src/misc/mixing.o vendor/cigraph/src/misc/motifs.o vendor/cigraph/src/misc/graphicality.o vendor/cigraph/src/misc/matching.o vendor/cigraph/src/misc/order_cycle.o vendor/cigraph/src/misc/spanning_trees.o vendor/cigraph/src/misc/sir.o vendor/cigraph/src/misc/bipartite.o vendor/cigraph/src/misc/chordality.o vendor/cigraph/src/misc/microscopic_update.o vendor/cigraph/src/misc/coloring.o vendor/cigraph/src/misc/other.o vendor/cigraph/src/misc/conversion.o vendor/cigraph/src/operators/disjoint_union.o vendor/cigraph/src/operators/subgraph.o vendor/cigraph/src/operators/intersection.o vendor/cigraph/src/operators/simplify.o vendor/cigraph/src/operators/compose.o vendor/cigraph/src/operators/complementer.o vendor/cigraph/src/operators/rewire_edges.o vendor/cigraph/src/operators/union.o vendor/cigraph/src/operators/permute.o vendor/cigraph/src/operators/misc_internal.o vendor/cigraph/src/operators/contract.o vendor/cigraph/src/operators/add_edge.o vendor/cigraph/src/operators/reverse.o vendor/cigraph/src/operators/difference.o vendor/cigraph/src/operators/connect_neighborhood.o vendor/cigraph/src/operators/rewire.o vendor/cigraph/src/paths/astar.o vendor/cigraph/src/paths/widest_paths.o vendor/cigraph/src/paths/random_walk.o vendor/cigraph/src/paths/distances.o vendor/cigraph/src/paths/floyd_warshall.o vendor/cigraph/src/paths/shortest_paths.o vendor/cigraph/src/paths/eulerian.o vendor/cigraph/src/paths/johnson.o vendor/cigraph/src/paths/bellman_ford.o vendor/cigraph/src/paths/voronoi.o vendor/cigraph/src/paths/unweighted.o vendor/cigraph/src/paths/all_shortest_paths.o vendor/cigraph/src/paths/sparsifier.o vendor/cigraph/src/paths/dijkstra.o vendor/cigraph/src/paths/simple_paths.o vendor/cigraph/src/paths/histogram.o vendor/cigraph/src/properties/degrees.o vendor/cigraph/src/properties/triangles.o vendor/cigraph/src/properties/basic_properties.o vendor/cigraph/src/properties/girth.o vendor/cigraph/src/properties/loops.o vendor/cigraph/src/properties/constraint.o vendor/cigraph/src/properties/convergence_degree.o vendor/cigraph/src/properties/ecc.o vendor/cigraph/src/properties/neighborhood.o vendor/cigraph/src/properties/dag.o vendor/cigraph/src/properties/multiplicity.o vendor/cigraph/src/properties/spectral.o vendor/cigraph/src/properties/perfect.o vendor/cigraph/src/properties/trees.o vendor/cigraph/src/random/rng_pcg64.o vendor/cigraph/src/random/rng_glibc2.o vendor/cigraph/src/random/rng_pcg32.o vendor/cigraph/src/random/rng_mt19937.o vendor/cigraph/src/random/random.o vendor/cigraph/vendor/cs/cs_post.o vendor/cigraph/vendor/cs/cs_updown.o vendor/cigraph/vendor/cs/cs_amd.o vendor/cigraph/vendor/cs/cs_happly.o vendor/cigraph/vendor/cs/cs_pinv.o vendor/cigraph/vendor/cs/cs_droptol.o vendor/cigraph/vendor/cs/cs_cumsum.o vendor/cigraph/vendor/cs/cs_permute.o vendor/cigraph/vendor/cs/cs_counts.o vendor/cigraph/vendor/cs/cs_qrsol.o vendor/cigraph/vendor/cs/cs_lu.o vendor/cigraph/vendor/cs/cs_dropzeros.o vendor/cigraph/vendor/cs/cs_tdfs.o vendor/cigraph/vendor/cs/cs_entry.o vendor/cigraph/vendor/cs/cs_chol.o vendor/cigraph/vendor/cs/cs_ltsolve.o vendor/cigraph/vendor/cs/cs_cholsol.o vendor/cigraph/vendor/cs/cs_dfs.o vendor/cigraph/vendor/cs/cs_add.o vendor/cigraph/vendor/cs/cs_usolve.o vendor/cigraph/vendor/cs/cs_pvec.o vendor/cigraph/vendor/cs/cs_ereach.o vendor/cigraph/vendor/cs/cs_etree.o vendor/cigraph/vendor/cs/cs_gaxpy.o vendor/cigraph/vendor/cs/cs_spsolve.o vendor/cigraph/vendor/cs/cs_randperm.o vendor/cigraph/vendor/cs/cs_ipvec.o vendor/cigraph/vendor/cs/cs_house.o vendor/cigraph/vendor/cs/cs_qr.o vendor/cigraph/vendor/cs/cs_print.o vendor/cigraph/vendor/cs/cs_maxtrans.o vendor/cigraph/vendor/cs/cs_dmperm.o vendor/cigraph/vendor/cs/cs_utsolve.o vendor/cigraph/vendor/cs/cs_lusol.o vendor/cigraph/vendor/cs/cs_symperm.o vendor/cigraph/vendor/cs/cs_scatter.o vendor/cigraph/vendor/cs/cs_reach.o vendor/cigraph/vendor/cs/cs_dupl.o vendor/cigraph/vendor/cs/cs_transpose.o vendor/cigraph/vendor/cs/cs_leaf.o vendor/cigraph/vendor/cs/cs_scc.o vendor/cigraph/vendor/cs/cs_lsolve.o vendor/cigraph/vendor/cs/cs_util.o vendor/cigraph/vendor/cs/cs_compress.o vendor/cigraph/vendor/cs/cs_fkeep.o vendor/cigraph/vendor/cs/cs_load.o vendor/cigraph/vendor/cs/cs_norm.o vendor/cigraph/vendor/cs/cs_sqr.o vendor/cigraph/vendor/cs/cs_malloc.o vendor/cigraph/vendor/cs/cs_multiply.o vendor/cigraph/vendor/cs/cs_schol.o vendor/cigraph/vendor/pcg/pcg-rngs-64.o vendor/cigraph/vendor/pcg/pcg-output-32.o vendor/cigraph/vendor/pcg/pcg-advance-128.o vendor/cigraph/vendor/pcg/pcg-advance-64.o vendor/cigraph/vendor/pcg/pcg-rngs-128.o vendor/cigraph/vendor/pcg/pcg-output-128.o vendor/cigraph/vendor/pcg/pcg-output-64.o vendor/cigraph/vendor/plfit/options.o vendor/cigraph/vendor/plfit/lbfgs.o vendor/cigraph/vendor/plfit/mt.o vendor/cigraph/vendor/plfit/gss.o vendor/cigraph/vendor/plfit/rbinom.o vendor/cigraph/vendor/plfit/plfit_error.o vendor/cigraph/vendor/plfit/hzeta.o vendor/cigraph/vendor/plfit/plfit.o vendor/cigraph/vendor/plfit/platform.o vendor/cigraph/vendor/plfit/sampling.o vendor/cigraph/vendor/plfit/kolmogorov.o vendor/io/dl-parser.o vendor/io/ncol-lexer.o vendor/io/gml-parser.o vendor/io/ncol-parser.o vendor/io/gml-lexer.o vendor/io/dl-lexer.o vendor/io/lgl-parser.o vendor/io/lgl-lexer.o vendor/io/pajek-lexer.o vendor/io/pajek-parser.o vendor/simpleraytracer/Triangle.o vendor/simpleraytracer/Light.o vendor/simpleraytracer/unit_limiter.o vendor/simpleraytracer/Ray.o vendor/simpleraytracer/RayTracer.o vendor/simpleraytracer/Point.o vendor/simpleraytracer/Color.o vendor/simpleraytracer/Sphere.o vendor/simpleraytracer/Shape.o vendor/simpleraytracer/RayVector.o vendor/uuid/isnull.o vendor/uuid/clear.o vendor/uuid/unparse.o vendor/uuid/compare.o vendor/uuid/R.o vendor/uuid/pack.o vendor/uuid/gen_uuid.o vendor/uuid/unpack.o vendor/uuid/parse.o vendor/uuid/copy.o +SOURCES=cpp11.o cpprinterface.o init.o lazyeval.o rinterface.o rinterface_extra.o rrandom.o simpleraytracer.o vendor/arpack/dgetv0.o vendor/arpack/dlaqrb.o vendor/arpack/dmout.o vendor/arpack/dnaitr.o vendor/arpack/dnapps.o vendor/arpack/dnaup2.o vendor/arpack/dnaupd.o vendor/arpack/dnconv.o vendor/arpack/dneigh.o vendor/arpack/dneupd.o vendor/arpack/dngets.o vendor/arpack/dsaitr.o vendor/arpack/dsapps.o vendor/arpack/dsaup2.o vendor/arpack/dsaupd.o vendor/arpack/dsconv.o vendor/arpack/dseigt.o vendor/arpack/dsesrt.o vendor/arpack/dseupd.o vendor/arpack/dsgets.o vendor/arpack/dsortc.o vendor/arpack/dsortr.o vendor/arpack/dstatn.o vendor/arpack/dstats.o vendor/arpack/dstqrb.o vendor/arpack/dvout.o vendor/arpack/ivout.o vendor/arpack/second.o vendor/arpack/wrap.o vendor/cigraph/src/centrality/betweenness.o vendor/cigraph/src/centrality/centrality_other.o vendor/cigraph/src/centrality/centralization.o vendor/cigraph/src/centrality/closeness.o vendor/cigraph/src/centrality/coreness.o vendor/cigraph/src/centrality/eigenvector.o vendor/cigraph/src/centrality/hub_authority.o vendor/cigraph/src/centrality/pagerank.o vendor/cigraph/src/centrality/prpack.o vendor/cigraph/src/centrality/prpack/prpack_base_graph.o vendor/cigraph/src/centrality/prpack/prpack_igraph_graph.o vendor/cigraph/src/centrality/prpack/prpack_preprocessed_ge_graph.o vendor/cigraph/src/centrality/prpack/prpack_preprocessed_gs_graph.o vendor/cigraph/src/centrality/prpack/prpack_preprocessed_scc_graph.o vendor/cigraph/src/centrality/prpack/prpack_preprocessed_schur_graph.o vendor/cigraph/src/centrality/prpack/prpack_result.o vendor/cigraph/src/centrality/prpack/prpack_solver.o vendor/cigraph/src/centrality/prpack/prpack_utils.o vendor/cigraph/src/centrality/truss.o vendor/cigraph/src/cliques/cliquer/cliquer.o vendor/cigraph/src/cliques/cliquer/cliquer_graph.o vendor/cigraph/src/cliques/cliquer/reorder.o vendor/cigraph/src/cliques/cliquer_wrapper.o vendor/cigraph/src/cliques/cliques.o vendor/cigraph/src/cliques/glet.o vendor/cigraph/src/cliques/maximal_cliques.o vendor/cigraph/src/community/community_misc.o vendor/cigraph/src/community/edge_betweenness.o vendor/cigraph/src/community/fast_modularity.o vendor/cigraph/src/community/fluid.o vendor/cigraph/src/community/infomap/infomap.o vendor/cigraph/src/community/infomap/infomap_FlowGraph.o vendor/cigraph/src/community/infomap/infomap_Greedy.o vendor/cigraph/src/community/label_propagation.o vendor/cigraph/src/community/leading_eigenvector.o vendor/cigraph/src/community/leiden.o vendor/cigraph/src/community/louvain.o vendor/cigraph/src/community/modularity.o vendor/cigraph/src/community/optimal_modularity.o vendor/cigraph/src/community/spinglass/NetDataTypes.o vendor/cigraph/src/community/spinglass/NetRoutines.o vendor/cigraph/src/community/spinglass/clustertool.o vendor/cigraph/src/community/spinglass/pottsmodel_2.o vendor/cigraph/src/community/voronoi.o vendor/cigraph/src/community/walktrap/walktrap.o vendor/cigraph/src/community/walktrap/walktrap_communities.o vendor/cigraph/src/community/walktrap/walktrap_graph.o vendor/cigraph/src/community/walktrap/walktrap_heap.o vendor/cigraph/src/connectivity/cohesive_blocks.o vendor/cigraph/src/connectivity/components.o vendor/cigraph/src/connectivity/separators.o vendor/cigraph/src/constructors/adjacency.o vendor/cigraph/src/constructors/atlas.o vendor/cigraph/src/constructors/basic_constructors.o vendor/cigraph/src/constructors/circulant.o vendor/cigraph/src/constructors/de_bruijn.o vendor/cigraph/src/constructors/famous.o vendor/cigraph/src/constructors/full.o vendor/cigraph/src/constructors/generalized_petersen.o vendor/cigraph/src/constructors/kautz.o vendor/cigraph/src/constructors/lattices.o vendor/cigraph/src/constructors/lcf.o vendor/cigraph/src/constructors/linegraph.o vendor/cigraph/src/constructors/prufer.o vendor/cigraph/src/constructors/regular.o vendor/cigraph/src/constructors/trees.o vendor/cigraph/src/core/array.o vendor/cigraph/src/core/buckets.o vendor/cigraph/src/core/cutheap.o vendor/cigraph/src/core/dqueue.o vendor/cigraph/src/core/error.o vendor/cigraph/src/core/estack.o vendor/cigraph/src/core/fixed_vectorlist.o vendor/cigraph/src/core/genheap.o vendor/cigraph/src/core/grid.o vendor/cigraph/src/core/heap.o vendor/cigraph/src/core/indheap.o vendor/cigraph/src/core/interruption.o vendor/cigraph/src/core/marked_queue.o vendor/cigraph/src/core/matrix.o vendor/cigraph/src/core/matrix_list.o vendor/cigraph/src/core/memory.o vendor/cigraph/src/core/printing.o vendor/cigraph/src/core/progress.o vendor/cigraph/src/core/psumtree.o vendor/cigraph/src/core/set.o vendor/cigraph/src/core/sparsemat.o vendor/cigraph/src/core/stack.o vendor/cigraph/src/core/statusbar.o vendor/cigraph/src/core/strvector.o vendor/cigraph/src/core/trie.o vendor/cigraph/src/core/vector.o vendor/cigraph/src/core/vector_list.o vendor/cigraph/src/core/vector_ptr.o vendor/cigraph/src/flow/flow.o vendor/cigraph/src/flow/flow_conversion.o vendor/cigraph/src/flow/st-cuts.o vendor/cigraph/src/games/barabasi.o vendor/cigraph/src/games/callaway_traits.o vendor/cigraph/src/games/citations.o vendor/cigraph/src/games/correlated.o vendor/cigraph/src/games/degree_sequence.o vendor/cigraph/src/games/degree_sequence_vl/gengraph_degree_sequence.o vendor/cigraph/src/games/degree_sequence_vl/gengraph_graph_molloy_hash.o vendor/cigraph/src/games/degree_sequence_vl/gengraph_graph_molloy_optimized.o vendor/cigraph/src/games/degree_sequence_vl/gengraph_mr-connected.o vendor/cigraph/src/games/degree_sequence_vl/gengraph_random.o vendor/cigraph/src/games/dotproduct.o vendor/cigraph/src/games/erdos_renyi.o vendor/cigraph/src/games/establishment.o vendor/cigraph/src/games/forestfire.o vendor/cigraph/src/games/grg.o vendor/cigraph/src/games/growing_random.o vendor/cigraph/src/games/islands.o vendor/cigraph/src/games/k_regular.o vendor/cigraph/src/games/preference.o vendor/cigraph/src/games/recent_degree.o vendor/cigraph/src/games/sbm.o vendor/cigraph/src/games/static_fitness.o vendor/cigraph/src/games/tree.o vendor/cigraph/src/games/watts_strogatz.o vendor/cigraph/src/graph/adjlist.o vendor/cigraph/src/graph/attributes.o vendor/cigraph/src/graph/basic_query.o vendor/cigraph/src/graph/caching.o vendor/cigraph/src/graph/cattributes.o vendor/cigraph/src/graph/graph_list.o vendor/cigraph/src/graph/iterators.o vendor/cigraph/src/graph/type_common.o vendor/cigraph/src/graph/type_indexededgelist.o vendor/cigraph/src/graph/visitors.o vendor/cigraph/src/hrg/hrg.o vendor/cigraph/src/hrg/hrg_types.o vendor/cigraph/src/internal/glpk_support.o vendor/cigraph/src/internal/hacks.o vendor/cigraph/src/internal/lsap.o vendor/cigraph/src/internal/qsort.o vendor/cigraph/src/internal/qsort_r.o vendor/cigraph/src/internal/utils.o vendor/cigraph/src/internal/zeroin.o vendor/cigraph/src/io/dimacs.o vendor/cigraph/src/io/dl.o vendor/cigraph/src/io/dot.o vendor/cigraph/src/io/edgelist.o vendor/cigraph/src/io/gml-tree.o vendor/cigraph/src/io/gml.o vendor/cigraph/src/io/graphdb.o vendor/cigraph/src/io/graphml.o vendor/cigraph/src/io/leda.o vendor/cigraph/src/io/lgl.o vendor/cigraph/src/io/ncol.o vendor/cigraph/src/io/pajek.o vendor/cigraph/src/io/parse_utils.o vendor/cigraph/src/isomorphism/bliss.o vendor/cigraph/src/isomorphism/bliss/defs.o vendor/cigraph/src/isomorphism/bliss/graph.o vendor/cigraph/src/isomorphism/bliss/heap.o vendor/cigraph/src/isomorphism/bliss/orbit.o vendor/cigraph/src/isomorphism/bliss/partition.o vendor/cigraph/src/isomorphism/bliss/uintseqhash.o vendor/cigraph/src/isomorphism/bliss/utils.o vendor/cigraph/src/isomorphism/isoclasses.o vendor/cigraph/src/isomorphism/isomorphism_misc.o vendor/cigraph/src/isomorphism/lad.o vendor/cigraph/src/isomorphism/queries.o vendor/cigraph/src/isomorphism/vf2.o vendor/cigraph/src/layout/circular.o vendor/cigraph/src/layout/davidson_harel.o vendor/cigraph/src/layout/drl/DensityGrid.o vendor/cigraph/src/layout/drl/DensityGrid_3d.o vendor/cigraph/src/layout/drl/drl_graph.o vendor/cigraph/src/layout/drl/drl_graph_3d.o vendor/cigraph/src/layout/drl/drl_layout.o vendor/cigraph/src/layout/drl/drl_layout_3d.o vendor/cigraph/src/layout/drl/drl_parse.o vendor/cigraph/src/layout/fruchterman_reingold.o vendor/cigraph/src/layout/gem.o vendor/cigraph/src/layout/graphopt.o vendor/cigraph/src/layout/kamada_kawai.o vendor/cigraph/src/layout/large_graph.o vendor/cigraph/src/layout/layout_bipartite.o vendor/cigraph/src/layout/layout_grid.o vendor/cigraph/src/layout/layout_random.o vendor/cigraph/src/layout/mds.o vendor/cigraph/src/layout/merge_dla.o vendor/cigraph/src/layout/merge_grid.o vendor/cigraph/src/layout/reingold_tilford.o vendor/cigraph/src/layout/sugiyama.o vendor/cigraph/src/layout/umap.o vendor/cigraph/src/linalg/arpack.o vendor/cigraph/src/linalg/blas.o vendor/cigraph/src/linalg/eigen.o vendor/cigraph/src/linalg/lapack.o vendor/cigraph/src/math/complex.o vendor/cigraph/src/math/safe_intop.o vendor/cigraph/src/math/utils.o vendor/cigraph/src/misc/bipartite.o vendor/cigraph/src/misc/chordality.o vendor/cigraph/src/misc/cocitation.o vendor/cigraph/src/misc/coloring.o vendor/cigraph/src/misc/conversion.o vendor/cigraph/src/misc/cycle_bases.o vendor/cigraph/src/misc/degree_sequence.o vendor/cigraph/src/misc/embedding.o vendor/cigraph/src/misc/feedback_arc_set.o vendor/cigraph/src/misc/graphicality.o vendor/cigraph/src/misc/matching.o vendor/cigraph/src/misc/microscopic_update.o vendor/cigraph/src/misc/mixing.o vendor/cigraph/src/misc/motifs.o vendor/cigraph/src/misc/order_cycle.o vendor/cigraph/src/misc/other.o vendor/cigraph/src/misc/power_law_fit.o vendor/cigraph/src/misc/scan.o vendor/cigraph/src/misc/sir.o vendor/cigraph/src/misc/spanning_trees.o vendor/cigraph/src/operators/add_edge.o vendor/cigraph/src/operators/complementer.o vendor/cigraph/src/operators/compose.o vendor/cigraph/src/operators/connect_neighborhood.o vendor/cigraph/src/operators/contract.o vendor/cigraph/src/operators/difference.o vendor/cigraph/src/operators/disjoint_union.o vendor/cigraph/src/operators/intersection.o vendor/cigraph/src/operators/misc_internal.o vendor/cigraph/src/operators/permute.o vendor/cigraph/src/operators/reverse.o vendor/cigraph/src/operators/rewire.o vendor/cigraph/src/operators/rewire_edges.o vendor/cigraph/src/operators/simplify.o vendor/cigraph/src/operators/subgraph.o vendor/cigraph/src/operators/union.o vendor/cigraph/src/paths/all_shortest_paths.o vendor/cigraph/src/paths/astar.o vendor/cigraph/src/paths/bellman_ford.o vendor/cigraph/src/paths/dijkstra.o vendor/cigraph/src/paths/distances.o vendor/cigraph/src/paths/eulerian.o vendor/cigraph/src/paths/floyd_warshall.o vendor/cigraph/src/paths/histogram.o vendor/cigraph/src/paths/johnson.o vendor/cigraph/src/paths/random_walk.o vendor/cigraph/src/paths/shortest_paths.o vendor/cigraph/src/paths/simple_paths.o vendor/cigraph/src/paths/sparsifier.o vendor/cigraph/src/paths/unweighted.o vendor/cigraph/src/paths/voronoi.o vendor/cigraph/src/paths/widest_paths.o vendor/cigraph/src/properties/basic_properties.o vendor/cigraph/src/properties/constraint.o vendor/cigraph/src/properties/convergence_degree.o vendor/cigraph/src/properties/dag.o vendor/cigraph/src/properties/degrees.o vendor/cigraph/src/properties/ecc.o vendor/cigraph/src/properties/girth.o vendor/cigraph/src/properties/loops.o vendor/cigraph/src/properties/multiplicity.o vendor/cigraph/src/properties/neighborhood.o vendor/cigraph/src/properties/perfect.o vendor/cigraph/src/properties/spectral.o vendor/cigraph/src/properties/trees.o vendor/cigraph/src/properties/triangles.o vendor/cigraph/src/random/random.o vendor/cigraph/src/random/rng_glibc2.o vendor/cigraph/src/random/rng_mt19937.o vendor/cigraph/src/random/rng_pcg32.o vendor/cigraph/src/random/rng_pcg64.o vendor/cigraph/src/version.o vendor/cigraph/vendor/cs/cs_add.o vendor/cigraph/vendor/cs/cs_amd.o vendor/cigraph/vendor/cs/cs_chol.o vendor/cigraph/vendor/cs/cs_cholsol.o vendor/cigraph/vendor/cs/cs_compress.o vendor/cigraph/vendor/cs/cs_counts.o vendor/cigraph/vendor/cs/cs_cumsum.o vendor/cigraph/vendor/cs/cs_dfs.o vendor/cigraph/vendor/cs/cs_dmperm.o vendor/cigraph/vendor/cs/cs_droptol.o vendor/cigraph/vendor/cs/cs_dropzeros.o vendor/cigraph/vendor/cs/cs_dupl.o vendor/cigraph/vendor/cs/cs_entry.o vendor/cigraph/vendor/cs/cs_ereach.o vendor/cigraph/vendor/cs/cs_etree.o vendor/cigraph/vendor/cs/cs_fkeep.o vendor/cigraph/vendor/cs/cs_gaxpy.o vendor/cigraph/vendor/cs/cs_happly.o vendor/cigraph/vendor/cs/cs_house.o vendor/cigraph/vendor/cs/cs_ipvec.o vendor/cigraph/vendor/cs/cs_leaf.o vendor/cigraph/vendor/cs/cs_load.o vendor/cigraph/vendor/cs/cs_lsolve.o vendor/cigraph/vendor/cs/cs_ltsolve.o vendor/cigraph/vendor/cs/cs_lu.o vendor/cigraph/vendor/cs/cs_lusol.o vendor/cigraph/vendor/cs/cs_malloc.o vendor/cigraph/vendor/cs/cs_maxtrans.o vendor/cigraph/vendor/cs/cs_multiply.o vendor/cigraph/vendor/cs/cs_norm.o vendor/cigraph/vendor/cs/cs_permute.o vendor/cigraph/vendor/cs/cs_pinv.o vendor/cigraph/vendor/cs/cs_post.o vendor/cigraph/vendor/cs/cs_print.o vendor/cigraph/vendor/cs/cs_pvec.o vendor/cigraph/vendor/cs/cs_qr.o vendor/cigraph/vendor/cs/cs_qrsol.o vendor/cigraph/vendor/cs/cs_randperm.o vendor/cigraph/vendor/cs/cs_reach.o vendor/cigraph/vendor/cs/cs_scatter.o vendor/cigraph/vendor/cs/cs_scc.o vendor/cigraph/vendor/cs/cs_schol.o vendor/cigraph/vendor/cs/cs_spsolve.o vendor/cigraph/vendor/cs/cs_sqr.o vendor/cigraph/vendor/cs/cs_symperm.o vendor/cigraph/vendor/cs/cs_tdfs.o vendor/cigraph/vendor/cs/cs_transpose.o vendor/cigraph/vendor/cs/cs_updown.o vendor/cigraph/vendor/cs/cs_usolve.o vendor/cigraph/vendor/cs/cs_util.o vendor/cigraph/vendor/cs/cs_utsolve.o vendor/cigraph/vendor/pcg/pcg-advance-128.o vendor/cigraph/vendor/pcg/pcg-advance-64.o vendor/cigraph/vendor/pcg/pcg-output-128.o vendor/cigraph/vendor/pcg/pcg-output-32.o vendor/cigraph/vendor/pcg/pcg-output-64.o vendor/cigraph/vendor/pcg/pcg-rngs-128.o vendor/cigraph/vendor/pcg/pcg-rngs-64.o vendor/cigraph/vendor/plfit/gss.o vendor/cigraph/vendor/plfit/hzeta.o vendor/cigraph/vendor/plfit/kolmogorov.o vendor/cigraph/vendor/plfit/lbfgs.o vendor/cigraph/vendor/plfit/mt.o vendor/cigraph/vendor/plfit/options.o vendor/cigraph/vendor/plfit/platform.o vendor/cigraph/vendor/plfit/plfit.o vendor/cigraph/vendor/plfit/plfit_error.o vendor/cigraph/vendor/plfit/rbinom.o vendor/cigraph/vendor/plfit/sampling.o vendor/io/dl-lexer.o vendor/io/dl-parser.o vendor/io/gml-lexer.o vendor/io/gml-parser.o vendor/io/lgl-lexer.o vendor/io/lgl-parser.o vendor/io/ncol-lexer.o vendor/io/ncol-parser.o vendor/io/pajek-lexer.o vendor/io/pajek-parser.o vendor/simpleraytracer/Color.o vendor/simpleraytracer/Light.o vendor/simpleraytracer/Point.o vendor/simpleraytracer/Ray.o vendor/simpleraytracer/RayTracer.o vendor/simpleraytracer/RayVector.o vendor/simpleraytracer/Shape.o vendor/simpleraytracer/Sphere.o vendor/simpleraytracer/Triangle.o vendor/simpleraytracer/unit_limiter.o vendor/uuid/R.o vendor/uuid/clear.o vendor/uuid/compare.o vendor/uuid/copy.o vendor/uuid/gen_uuid.o vendor/uuid/isnull.o vendor/uuid/pack.o vendor/uuid/parse.o vendor/uuid/unpack.o vendor/uuid/unparse.o diff --git a/src/vendor/io/dl-parser.c b/src/vendor/io/dl-parser.c index 2a07ae75227..b3cb901766e 100644 --- a/src/vendor/io/dl-parser.c +++ b/src/vendor/io/dl-parser.c @@ -117,7 +117,7 @@ static igraph_error_t igraph_i_dl_check_vid(igraph_integer_t dl_vid); #define scanner context->scanner -#line 121 "yy.tab.c" +#line 121 "src/vendor/io/dl-parser.c" # ifndef YY_CAST # ifdef __cplusplus @@ -140,7 +140,7 @@ static igraph_error_t igraph_i_dl_check_vid(igraph_integer_t dl_vid); # endif # endif -#include "io/parsers/dl-parser.h" +#include "dl-parser.h" /* Symbol kind. */ enum yysymbol_kind_t { @@ -1647,61 +1647,61 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_YY_ERRORF("Vertex count too large in DL file (%" IGRAPH_PRId ").", IGRAPH_EINVAL, context->n); } } -#line 1651 "yy.tab.c" +#line 1651 "src/vendor/io/dl-parser.c" break; case 7: /* rest: formfullmatrix */ #line 118 "src/vendor/cigraph/src/io/dl-parser.y" { context->type=IGRAPH_DL_MATRIX; } -#line 1657 "yy.tab.c" +#line 1657 "src/vendor/io/dl-parser.c" break; case 8: /* rest: edgelist1 */ #line 119 "src/vendor/cigraph/src/io/dl-parser.y" { context->type=IGRAPH_DL_EDGELIST1; } -#line 1663 "yy.tab.c" +#line 1663 "src/vendor/io/dl-parser.c" break; case 9: /* rest: nodelist1 */ #line 120 "src/vendor/cigraph/src/io/dl-parser.y" { context->type=IGRAPH_DL_NODELIST1; } -#line 1669 "yy.tab.c" +#line 1669 "src/vendor/io/dl-parser.c" break; case 10: /* formfullmatrix: FORMATFULLMATRIX newline fullmatrix */ #line 123 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1675 "yy.tab.c" +#line 1675 "src/vendor/io/dl-parser.c" break; case 11: /* formfullmatrix: fullmatrix */ #line 123 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1681 "yy.tab.c" +#line 1681 "src/vendor/io/dl-parser.c" break; case 14: /* fullmatrix: "data:" newline fullmatrixdata */ #line 127 "src/vendor/cigraph/src/io/dl-parser.y" { } -#line 1687 "yy.tab.c" +#line 1687 "src/vendor/io/dl-parser.c" break; case 15: /* fullmatrix: "labels:" newline labels newline "data:" newline fullmatrixdata */ #line 128 "src/vendor/cigraph/src/io/dl-parser.y" { } -#line 1693 "yy.tab.c" +#line 1693 "src/vendor/io/dl-parser.c" break; case 16: /* fullmatrix: "labels embedded:" newline "data:" newline labeledfullmatrixdata */ #line 129 "src/vendor/cigraph/src/io/dl-parser.y" { } -#line 1699 "yy.tab.c" +#line 1699 "src/vendor/io/dl-parser.c" break; case 17: /* labels: %empty */ #line 132 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1705 "yy.tab.c" +#line 1705 "src/vendor/io/dl-parser.c" break; case 18: /* labels: labels newline "label" */ @@ -1710,13 +1710,13 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_YY_CHECK(igraph_i_dl_add_str(igraph_dl_yyget_text(scanner), igraph_dl_yyget_leng(scanner), context)); } -#line 1714 "yy.tab.c" +#line 1714 "src/vendor/io/dl-parser.c" break; case 19: /* fullmatrixdata: %empty */ #line 139 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1720 "yy.tab.c" +#line 1720 "src/vendor/io/dl-parser.c" break; case 20: /* fullmatrixdata: fullmatrixdata zerooneseq "end of line" */ @@ -1725,13 +1725,13 @@ YYLTYPE yylloc = yyloc_default; context->from += 1; context->to = 0; } -#line 1729 "yy.tab.c" +#line 1729 "src/vendor/io/dl-parser.c" break; case 22: /* zerooneseq: zerooneseq zeroone */ #line 144 "src/vendor/cigraph/src/io/dl-parser.y" { } -#line 1735 "yy.tab.c" +#line 1735 "src/vendor/io/dl-parser.c" break; case 23: /* zeroone: "binary digit" */ @@ -1750,19 +1750,19 @@ YYLTYPE yylloc = yyloc_default; } context->to += 1; } -#line 1754 "yy.tab.c" +#line 1754 "src/vendor/io/dl-parser.c" break; case 24: /* labeledfullmatrixdata: reallabeledfullmatrixdata */ #line 161 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1760 "yy.tab.c" +#line 1760 "src/vendor/io/dl-parser.c" break; case 25: /* reallabeledfullmatrixdata: labelseq "end of line" labeledmatrixlines */ #line 163 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1766 "yy.tab.c" +#line 1766 "src/vendor/io/dl-parser.c" break; case 28: /* label: "label" */ @@ -1770,7 +1770,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(igraph_i_dl_add_str(igraph_dl_yyget_text(scanner), igraph_dl_yyget_leng(scanner), context)); } -#line 1774 "yy.tab.c" +#line 1774 "src/vendor/io/dl-parser.c" break; case 29: /* labeledmatrixlines: labeledmatrixline */ @@ -1779,7 +1779,7 @@ YYLTYPE yylloc = yyloc_default; context->from += 1; context->to = 0; } -#line 1783 "yy.tab.c" +#line 1783 "src/vendor/io/dl-parser.c" break; case 30: /* labeledmatrixlines: labeledmatrixlines labeledmatrixline */ @@ -1788,61 +1788,61 @@ YYLTYPE yylloc = yyloc_default; context->from += 1; context->to = 0; } -#line 1792 "yy.tab.c" +#line 1792 "src/vendor/io/dl-parser.c" break; case 31: /* labeledmatrixline: "label" zerooneseq "end of line" */ #line 180 "src/vendor/cigraph/src/io/dl-parser.y" { } -#line 1798 "yy.tab.c" +#line 1798 "src/vendor/io/dl-parser.c" break; case 32: /* edgelist1: FORMATEDGELIST1 newline edgelist1rest */ #line 184 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1804 "yy.tab.c" +#line 1804 "src/vendor/io/dl-parser.c" break; case 33: /* edgelist1rest: "data:" newline edgelist1data */ #line 186 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1810 "yy.tab.c" +#line 1810 "src/vendor/io/dl-parser.c" break; case 34: /* edgelist1rest: "labels:" newline labels newline "data:" newline edgelist1data */ #line 187 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1816 "yy.tab.c" +#line 1816 "src/vendor/io/dl-parser.c" break; case 35: /* edgelist1rest: "labels embedded:" newline "data:" newline labelededgelist1data */ #line 188 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1822 "yy.tab.c" +#line 1822 "src/vendor/io/dl-parser.c" break; case 36: /* edgelist1rest: "labels:" newline labels newline "labels embedded:" newline "data:" newline labelededgelist1data */ #line 189 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1828 "yy.tab.c" +#line 1828 "src/vendor/io/dl-parser.c" break; case 37: /* edgelist1rest: "labels embedded:" newline "labels:" newline labels newline "data:" newline labelededgelist1data */ #line 190 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1834 "yy.tab.c" +#line 1834 "src/vendor/io/dl-parser.c" break; case 38: /* edgelist1data: %empty */ #line 193 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1840 "yy.tab.c" +#line 1840 "src/vendor/io/dl-parser.c" break; case 39: /* edgelist1data: edgelist1data edgelist1dataline */ #line 194 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1846 "yy.tab.c" +#line 1846 "src/vendor/io/dl-parser.c" break; case 40: /* edgelist1dataline: integer integer weight "end of line" */ @@ -1852,7 +1852,7 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_YY_CHECK(igraph_i_dl_check_vid(from)); IGRAPH_YY_CHECK(igraph_i_dl_check_vid(to)); IGRAPH_YY_CHECK(igraph_i_dl_add_edge_w(from-1, to-1, (yyvsp[-1].real), context)); } -#line 1856 "yy.tab.c" +#line 1856 "src/vendor/io/dl-parser.c" break; case 41: /* edgelist1dataline: integer integer "end of line" */ @@ -1863,7 +1863,7 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_YY_CHECK(igraph_i_dl_check_vid(to)); IGRAPH_YY_CHECK(igraph_i_dl_add_edge(from-1, to-1, context)); } -#line 1867 "yy.tab.c" +#line 1867 "src/vendor/io/dl-parser.c" break; case 42: /* integer: "number" */ @@ -1875,26 +1875,26 @@ YYLTYPE yylloc = yyloc_default; &val)); (yyval.integer)=val; } -#line 1879 "yy.tab.c" +#line 1879 "src/vendor/io/dl-parser.c" break; case 43: /* labelededgelist1data: %empty */ #line 217 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1885 "yy.tab.c" +#line 1885 "src/vendor/io/dl-parser.c" break; case 44: /* labelededgelist1data: labelededgelist1data labelededgelist1dataline */ #line 218 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1891 "yy.tab.c" +#line 1891 "src/vendor/io/dl-parser.c" break; case 45: /* labelededgelist1dataline: elabel elabel weight "end of line" */ #line 221 "src/vendor/cigraph/src/io/dl-parser.y" { IGRAPH_YY_CHECK(igraph_i_dl_add_edge_w((yyvsp[-3].integer), (yyvsp[-2].integer), (yyvsp[-1].real), context)); } -#line 1898 "yy.tab.c" +#line 1898 "src/vendor/io/dl-parser.c" break; case 46: /* labelededgelist1dataline: elabel elabel "end of line" */ @@ -1902,7 +1902,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(igraph_i_dl_add_edge((yyvsp[-2].integer), (yyvsp[-1].integer), context)); } -#line 1906 "yy.tab.c" +#line 1906 "src/vendor/io/dl-parser.c" break; case 47: /* weight: "number" */ @@ -1914,7 +1914,7 @@ YYLTYPE yylloc = yyloc_default; &val)); (yyval.real)=val; } -#line 1918 "yy.tab.c" +#line 1918 "src/vendor/io/dl-parser.c" break; case 48: /* elabel: "label" */ @@ -1935,61 +1935,61 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_ASSERT(0 <= trie_id && trie_id < IGRAPH_DL_MAX_VERTEX_COUNT); (yyval.integer) = trie_id; } -#line 1939 "yy.tab.c" +#line 1939 "src/vendor/io/dl-parser.c" break; case 49: /* nodelist1: FORMATNODELIST1 newline nodelist1rest */ #line 254 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1945 "yy.tab.c" +#line 1945 "src/vendor/io/dl-parser.c" break; case 50: /* nodelist1rest: "data:" nodelist1data */ #line 256 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1951 "yy.tab.c" +#line 1951 "src/vendor/io/dl-parser.c" break; case 51: /* nodelist1rest: "labels:" newline labels newline "data:" newline nodelist1data */ #line 257 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1957 "yy.tab.c" +#line 1957 "src/vendor/io/dl-parser.c" break; case 52: /* nodelist1rest: "labels embedded:" newline "data:" newline labelednodelist1data */ #line 258 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1963 "yy.tab.c" +#line 1963 "src/vendor/io/dl-parser.c" break; case 53: /* nodelist1rest: "labels:" newline labels newline "labels embedded:" newline "data:" newline labelednodelist1data */ #line 259 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1969 "yy.tab.c" +#line 1969 "src/vendor/io/dl-parser.c" break; case 54: /* nodelist1rest: "labels embedded:" newline "labels:" newline labels newline "data:" newline labelednodelist1data */ #line 260 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1975 "yy.tab.c" +#line 1975 "src/vendor/io/dl-parser.c" break; case 55: /* nodelist1data: %empty */ #line 263 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1981 "yy.tab.c" +#line 1981 "src/vendor/io/dl-parser.c" break; case 56: /* nodelist1data: nodelist1data nodelist1dataline */ #line 264 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1987 "yy.tab.c" +#line 1987 "src/vendor/io/dl-parser.c" break; case 57: /* nodelist1dataline: from tolist "end of line" */ #line 267 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 1993 "yy.tab.c" +#line 1993 "src/vendor/io/dl-parser.c" break; case 58: /* from: "number" */ @@ -2000,13 +2000,13 @@ YYLTYPE yylloc = yyloc_default; &context->from)); IGRAPH_YY_CHECK(igraph_i_dl_check_vid(context->from)); } -#line 2004 "yy.tab.c" +#line 2004 "src/vendor/io/dl-parser.c" break; case 59: /* tolist: %empty */ #line 276 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 2010 "yy.tab.c" +#line 2010 "src/vendor/io/dl-parser.c" break; case 60: /* tolist: tolist integer */ @@ -2018,25 +2018,25 @@ YYLTYPE yylloc = yyloc_default; context->from-1)); IGRAPH_YY_CHECK(igraph_vector_int_push_back(&context->edges, to-1)); } -#line 2022 "yy.tab.c" +#line 2022 "src/vendor/io/dl-parser.c" break; case 61: /* labelednodelist1data: %empty */ #line 284 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 2028 "yy.tab.c" +#line 2028 "src/vendor/io/dl-parser.c" break; case 62: /* labelednodelist1data: labelednodelist1data labelednodelist1dataline */ #line 285 "src/vendor/cigraph/src/io/dl-parser.y" {} -#line 2034 "yy.tab.c" +#line 2034 "src/vendor/io/dl-parser.c" break; case 63: /* labelednodelist1dataline: fromelabel labeltolist "end of line" */ #line 288 "src/vendor/cigraph/src/io/dl-parser.y" { } -#line 2040 "yy.tab.c" +#line 2040 "src/vendor/io/dl-parser.c" break; case 64: /* fromelabel: elabel */ @@ -2044,7 +2044,7 @@ YYLTYPE yylloc = yyloc_default; { context->from=(yyvsp[0].integer); } -#line 2048 "yy.tab.c" +#line 2048 "src/vendor/io/dl-parser.c" break; case 66: /* labeltolist: labeltolist elabel */ @@ -2054,11 +2054,11 @@ YYLTYPE yylloc = yyloc_default; context->from)); IGRAPH_YY_CHECK(igraph_vector_int_push_back(&context->edges, (yyvsp[0].integer))); } -#line 2058 "yy.tab.c" +#line 2058 "src/vendor/io/dl-parser.c" break; -#line 2062 "yy.tab.c" +#line 2062 "src/vendor/io/dl-parser.c" default: break; } diff --git a/src/vendor/io/gml-parser.c b/src/vendor/io/gml-parser.c index 4f846527273..5de8aef6a32 100644 --- a/src/vendor/io/gml-parser.c +++ b/src/vendor/io/gml-parser.c @@ -133,7 +133,7 @@ static igraph_error_t igraph_i_gml_merge(igraph_gml_tree_t *t1, igraph_gml_tree_ #define scanner context->scanner -#line 137 "yy.tab.c" +#line 137 "src/vendor/io/gml-parser.c" # ifndef YY_CAST # ifdef __cplusplus @@ -156,7 +156,7 @@ static igraph_error_t igraph_i_gml_merge(igraph_gml_tree_t *t1, igraph_gml_tree_ # endif # endif -#include "io/parsers/gml-parser.h" +#include "gml-parser.h" /* Symbol kind. */ enum yysymbol_kind_t { @@ -1232,25 +1232,25 @@ yydestruct (const char *yymsg, case YYSYMBOL_list: /* list */ #line 117 "src/vendor/cigraph/src/io/gml-parser.y" { igraph_gml_tree_destroy(((*yyvaluep).tree)); } -#line 1236 "yy.tab.c" +#line 1236 "src/vendor/io/gml-parser.c" break; case YYSYMBOL_keyvalue: /* keyvalue */ #line 117 "src/vendor/cigraph/src/io/gml-parser.y" { igraph_gml_tree_destroy(((*yyvaluep).tree)); } -#line 1242 "yy.tab.c" +#line 1242 "src/vendor/io/gml-parser.c" break; case YYSYMBOL_key: /* key */ #line 116 "src/vendor/cigraph/src/io/gml-parser.y" { free(((*yyvaluep).str)); } -#line 1248 "yy.tab.c" +#line 1248 "src/vendor/io/gml-parser.c" break; case YYSYMBOL_string: /* string */ #line 116 "src/vendor/cigraph/src/io/gml-parser.y" { free(((*yyvaluep).str)); } -#line 1254 "yy.tab.c" +#line 1254 "src/vendor/io/gml-parser.c" break; default: @@ -1556,43 +1556,43 @@ YYLTYPE yylloc = yyloc_default; case 2: /* input: list */ #line 121 "src/vendor/cigraph/src/io/gml-parser.y" { context->tree=(yyvsp[0].tree); } -#line 1560 "yy.tab.c" +#line 1560 "src/vendor/io/gml-parser.c" break; case 3: /* list: %empty */ #line 123 "src/vendor/cigraph/src/io/gml-parser.y" { IGRAPH_YY_CHECK(igraph_i_gml_make_empty(&(yyval.tree))); } -#line 1566 "yy.tab.c" +#line 1566 "src/vendor/io/gml-parser.c" break; case 4: /* list: keyvalue */ #line 124 "src/vendor/cigraph/src/io/gml-parser.y" { (yyval.tree)=(yyvsp[0].tree); } -#line 1572 "yy.tab.c" +#line 1572 "src/vendor/io/gml-parser.c" break; case 5: /* list: list keyvalue */ #line 125 "src/vendor/cigraph/src/io/gml-parser.y" { IGRAPH_YY_CHECK(igraph_i_gml_merge((yyvsp[-1].tree), (yyvsp[0].tree))); (yyval.tree) = (yyvsp[-1].tree); } -#line 1578 "yy.tab.c" +#line 1578 "src/vendor/io/gml-parser.c" break; case 6: /* keyvalue: key num */ #line 128 "src/vendor/cigraph/src/io/gml-parser.y" { IGRAPH_YY_CHECK(igraph_i_gml_make_numeric((yyvsp[-1].str), (yylsp[-1]).first_line, (yyvsp[0].real), &(yyval.tree))); } -#line 1584 "yy.tab.c" +#line 1584 "src/vendor/io/gml-parser.c" break; case 7: /* keyvalue: key string */ #line 130 "src/vendor/cigraph/src/io/gml-parser.y" { IGRAPH_YY_CHECK(igraph_i_gml_make_string((yyvsp[-1].str), (yylsp[-1]).first_line, (yyvsp[0].str), &(yyval.tree))); } -#line 1590 "yy.tab.c" +#line 1590 "src/vendor/io/gml-parser.c" break; case 8: /* keyvalue: key "[" list "]" */ #line 132 "src/vendor/cigraph/src/io/gml-parser.y" { IGRAPH_YY_CHECK(igraph_i_gml_make_list((yyvsp[-3].str), (yylsp[-3]).first_line, (yyvsp[-1].tree), &(yyval.tree))); } -#line 1596 "yy.tab.c" +#line 1596 "src/vendor/io/gml-parser.c" break; case 9: /* key: "keyword" */ @@ -1600,7 +1600,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(igraph_i_gml_get_keyword(igraph_gml_yyget_text(scanner), igraph_gml_yyget_leng(scanner), &(yyval.str))); } -#line 1604 "yy.tab.c" +#line 1604 "src/vendor/io/gml-parser.c" break; case 10: /* num: "number" */ @@ -1612,7 +1612,7 @@ YYLTYPE yylloc = yyloc_default; &val)); (yyval.real)=val; } -#line 1616 "yy.tab.c" +#line 1616 "src/vendor/io/gml-parser.c" break; case 11: /* string: "string" */ @@ -1620,11 +1620,11 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(igraph_i_gml_get_string(igraph_gml_yyget_text(scanner), igraph_gml_yyget_leng(scanner), &(yyval.str))); } -#line 1624 "yy.tab.c" +#line 1624 "src/vendor/io/gml-parser.c" break; -#line 1628 "yy.tab.c" +#line 1628 "src/vendor/io/gml-parser.c" default: break; } diff --git a/src/vendor/io/lgl-parser.c b/src/vendor/io/lgl-parser.c index 683482c4516..1218a8a3fb7 100644 --- a/src/vendor/io/lgl-parser.c +++ b/src/vendor/io/lgl-parser.c @@ -115,7 +115,7 @@ int igraph_lgl_yyerror(YYLTYPE* locp, igraph_i_lgl_parsedata_t *context, #define scanner context->scanner -#line 119 "yy.tab.c" +#line 119 "src/vendor/io/lgl-parser.c" # ifndef YY_CAST # ifdef __cplusplus @@ -138,7 +138,7 @@ int igraph_lgl_yyerror(YYLTYPE* locp, igraph_i_lgl_parsedata_t *context, # endif # endif -#include "io/parsers/lgl-parser.h" +#include "lgl-parser.h" /* Symbol kind. */ enum yysymbol_kind_t { @@ -1509,7 +1509,7 @@ YYLTYPE yylloc = yyloc_default; case 6: /* vertexdef: "#" edgeid "end of line" */ #line 99 "src/vendor/cigraph/src/io/lgl-parser.y" { context->actvertex=(yyvsp[-1].edgenum); } -#line 1513 "yy.tab.c" +#line 1513 "src/vendor/io/lgl-parser.c" break; case 9: /* edge: edgeid "end of line" */ @@ -1519,7 +1519,7 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_YY_CHECK(igraph_vector_int_push_back(context->vector, (yyvsp[-1].edgenum))); IGRAPH_YY_CHECK(igraph_vector_push_back(context->weights, 0)); } -#line 1523 "yy.tab.c" +#line 1523 "src/vendor/io/lgl-parser.c" break; case 10: /* edge: edgeid weight "end of line" */ @@ -1530,7 +1530,7 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_YY_CHECK(igraph_vector_push_back(context->weights, (yyvsp[-1].weightnum))); context->has_weights = 1; } -#line 1534 "yy.tab.c" +#line 1534 "src/vendor/io/lgl-parser.c" break; case 11: /* edgeid: "alphanumeric" */ @@ -1544,7 +1544,7 @@ YYLTYPE yylloc = yyloc_default; )); (yyval.edgenum) = trie_id; } -#line 1548 "yy.tab.c" +#line 1548 "src/vendor/io/lgl-parser.c" break; case 12: /* weight: "alphanumeric" */ @@ -1556,11 +1556,11 @@ YYLTYPE yylloc = yyloc_default; &val)); (yyval.weightnum)=val; } -#line 1560 "yy.tab.c" +#line 1560 "src/vendor/io/lgl-parser.c" break; -#line 1564 "yy.tab.c" +#line 1564 "src/vendor/io/lgl-parser.c" default: break; } diff --git a/src/vendor/io/ncol-parser.c b/src/vendor/io/ncol-parser.c index 3ccf6c0ad2a..15916ec4094 100644 --- a/src/vendor/io/ncol-parser.c +++ b/src/vendor/io/ncol-parser.c @@ -116,7 +116,7 @@ int igraph_ncol_yyerror(YYLTYPE* locp, #define scanner context->scanner -#line 120 "yy.tab.c" +#line 120 "src/vendor/io/ncol-parser.c" # ifndef YY_CAST # ifdef __cplusplus @@ -139,7 +139,7 @@ int igraph_ncol_yyerror(YYLTYPE* locp, # endif # endif -#include "io/parsers/ncol-parser.h" +#include "ncol-parser.h" /* Symbol kind. */ enum yysymbol_kind_t { @@ -1504,7 +1504,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(igraph_vector_push_back(context->weights, 0.0)); } -#line 1508 "yy.tab.c" +#line 1508 "src/vendor/io/ncol-parser.c" break; case 6: /* edge: endpoints weight "end of line" */ @@ -1513,7 +1513,7 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_YY_CHECK(igraph_vector_push_back(context->weights, (yyvsp[-1].weightnum))); context->has_weights = true; } -#line 1517 "yy.tab.c" +#line 1517 "src/vendor/io/ncol-parser.c" break; case 7: /* endpoints: edgeid edgeid */ @@ -1522,7 +1522,7 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_YY_CHECK(igraph_vector_int_push_back(context->vector, (yyvsp[-1].edgenum))); IGRAPH_YY_CHECK(igraph_vector_int_push_back(context->vector, (yyvsp[0].edgenum))); } -#line 1526 "yy.tab.c" +#line 1526 "src/vendor/io/ncol-parser.c" break; case 8: /* edgeid: "alphanumeric" */ @@ -1536,7 +1536,7 @@ YYLTYPE yylloc = yyloc_default; )); (yyval.edgenum) = trie_id; } -#line 1540 "yy.tab.c" +#line 1540 "src/vendor/io/ncol-parser.c" break; case 9: /* weight: "alphanumeric" */ @@ -1548,11 +1548,11 @@ YYLTYPE yylloc = yyloc_default; &val)); (yyval.weightnum)=val; } -#line 1552 "yy.tab.c" +#line 1552 "src/vendor/io/ncol-parser.c" break; -#line 1556 "yy.tab.c" +#line 1556 "src/vendor/io/ncol-parser.c" default: break; } diff --git a/src/vendor/io/pajek-lexer.c b/src/vendor/io/pajek-lexer.c index 07bcbd156cc..0c32ca04b9c 100644 --- a/src/vendor/io/pajek-lexer.c +++ b/src/vendor/io/pajek-lexer.c @@ -898,7 +898,7 @@ static const flex_int32_t yy_rule_can_match_eol[58] = #line 899 "src/vendor/io/pajek-lexer.c" #define YY_NO_INPUT 1 /* Any use of {newline} below must use yy_set_bol(true) in order to mark the character - following a single \r as the first on a new line, and allow the ^ pattern to match. + following a single \r as the first on a new line, and allow the ^ pattern to match. This pattern must match single newlines only, in order to follow Pajek's "no newline after *Vertices" convention. */ /* Anything except non-printable (00-1F), space (20), del (7F), '"' and '*'. */ diff --git a/src/vendor/io/pajek-parser.c b/src/vendor/io/pajek-parser.c index 8c2ae84e062..b2e5ae639f4 100644 --- a/src/vendor/io/pajek-parser.c +++ b/src/vendor/io/pajek-parser.c @@ -155,7 +155,7 @@ static igraph_error_t deconflict_attrname(char **attrname); #define scanner context->scanner -#line 159 "yy.tab.c" +#line 159 "src/vendor/io/pajek-parser.c" # ifndef YY_CAST # ifdef __cplusplus @@ -178,7 +178,7 @@ static igraph_error_t deconflict_attrname(char **attrname); # endif # endif -#include "io/parsers/pajek-parser.h" +#include "pajek-parser.h" /* Symbol kind. */ enum yysymbol_kind_t { @@ -1488,7 +1488,7 @@ yydestruct (const char *yymsg, case YYSYMBOL_parname: /* parname */ #line 133 "src/vendor/cigraph/src/io/pajek-parser.y" { free(((*yyvaluep).dynstr)); } -#line 1492 "yy.tab.c" +#line 1492 "src/vendor/io/pajek-parser.c" break; default: @@ -1803,7 +1803,7 @@ YYLTYPE yylloc = yyloc_default; } YYACCEPT; /* stop parsing even if there is more data in the file. */ } -#line 1807 "yy.tab.c" +#line 1807 "src/vendor/io/pajek-parser.c" break; case 8: /* verticeshead: "*Vertices line" integer */ @@ -1818,7 +1818,7 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_YY_ERRORF("Vertex count too large in Pajek file (%" IGRAPH_PRId ").", IGRAPH_EINVAL, context->vcount); } } -#line 1822 "yy.tab.c" +#line 1822 "src/vendor/io/pajek-parser.c" break; case 9: /* verticeshead: "*Vertices line" integer integer */ @@ -1840,19 +1840,19 @@ YYLTYPE yylloc = yyloc_default; } IGRAPH_YY_CHECK(add_bipartite_type(context)); } -#line 1844 "yy.tab.c" +#line 1844 "src/vendor/io/pajek-parser.c" break; case 13: /* $@1: %empty */ #line 236 "src/vendor/cigraph/src/io/pajek-parser.y" { context->actvertex=(yyvsp[0].intnum); } -#line 1850 "yy.tab.c" +#line 1850 "src/vendor/io/pajek-parser.c" break; case 14: /* vertexline: vertex $@1 vertexid vertexcoords shape vertparams "end of line" */ #line 236 "src/vendor/cigraph/src/io/pajek-parser.y" { } -#line 1856 "yy.tab.c" +#line 1856 "src/vendor/io/pajek-parser.c" break; case 15: /* vertex: integer */ @@ -1867,7 +1867,7 @@ YYLTYPE yylloc = yyloc_default; } (yyval.intnum) = v; } -#line 1871 "yy.tab.c" +#line 1871 "src/vendor/io/pajek-parser.c" break; case 16: /* vertexid: word */ @@ -1876,7 +1876,7 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_YY_CHECK(add_string_vertex_attribute("id", (yyvsp[0].string).str, (yyvsp[0].string).len, context)); IGRAPH_YY_CHECK(add_string_vertex_attribute("name", (yyvsp[0].string).str, (yyvsp[0].string).len, context)); } -#line 1880 "yy.tab.c" +#line 1880 "src/vendor/io/pajek-parser.c" break; case 18: /* vertexcoords: number number */ @@ -1885,7 +1885,7 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_YY_CHECK(add_numeric_vertex_attribute("x", (yyvsp[-1].realnum), context)); IGRAPH_YY_CHECK(add_numeric_vertex_attribute("y", (yyvsp[0].realnum), context)); } -#line 1889 "yy.tab.c" +#line 1889 "src/vendor/io/pajek-parser.c" break; case 19: /* vertexcoords: number number number */ @@ -1895,7 +1895,7 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_YY_CHECK(add_numeric_vertex_attribute("y", (yyvsp[-1].realnum), context)); IGRAPH_YY_CHECK(add_numeric_vertex_attribute("z", (yyvsp[0].realnum), context)); } -#line 1899 "yy.tab.c" +#line 1899 "src/vendor/io/pajek-parser.c" break; case 21: /* shape: word */ @@ -1903,7 +1903,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_string_vertex_attribute("shape", (yyvsp[0].string).str, (yyvsp[0].string).len, context)); } -#line 1907 "yy.tab.c" +#line 1907 "src/vendor/io/pajek-parser.c" break; case 25: /* vertparam: VP_X_FACT number */ @@ -1911,7 +1911,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_vertex_attribute("xfact", (yyvsp[0].realnum), context)); } -#line 1915 "yy.tab.c" +#line 1915 "src/vendor/io/pajek-parser.c" break; case 26: /* vertparam: VP_Y_FACT number */ @@ -1919,7 +1919,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_vertex_attribute("yfact", (yyvsp[0].realnum), context)); } -#line 1923 "yy.tab.c" +#line 1923 "src/vendor/io/pajek-parser.c" break; case 27: /* vertparam: VP_LR number */ @@ -1927,7 +1927,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_vertex_attribute("labeldist", (yyvsp[0].realnum), context)); } -#line 1931 "yy.tab.c" +#line 1931 "src/vendor/io/pajek-parser.c" break; case 28: /* vertparam: VP_LPHI number */ @@ -1935,7 +1935,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_vertex_attribute("labeldegree2", (yyvsp[0].realnum), context)); } -#line 1939 "yy.tab.c" +#line 1939 "src/vendor/io/pajek-parser.c" break; case 29: /* vertparam: VP_BW number */ @@ -1943,7 +1943,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_vertex_attribute("framewidth", (yyvsp[0].realnum), context)); } -#line 1947 "yy.tab.c" +#line 1947 "src/vendor/io/pajek-parser.c" break; case 30: /* vertparam: VP_FOS number */ @@ -1951,7 +1951,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_vertex_attribute("fontsize", (yyvsp[0].realnum), context)); } -#line 1955 "yy.tab.c" +#line 1955 "src/vendor/io/pajek-parser.c" break; case 31: /* vertparam: VP_PHI number */ @@ -1959,7 +1959,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_vertex_attribute("rotation", (yyvsp[0].realnum), context)); } -#line 1963 "yy.tab.c" +#line 1963 "src/vendor/io/pajek-parser.c" break; case 32: /* vertparam: VP_R number */ @@ -1967,7 +1967,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_vertex_attribute("radius", (yyvsp[0].realnum), context)); } -#line 1971 "yy.tab.c" +#line 1971 "src/vendor/io/pajek-parser.c" break; case 33: /* vertparam: VP_Q number */ @@ -1975,7 +1975,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_vertex_attribute("diamondratio", (yyvsp[0].realnum), context)); } -#line 1979 "yy.tab.c" +#line 1979 "src/vendor/io/pajek-parser.c" break; case 34: /* vertparam: VP_LA number */ @@ -1983,7 +1983,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_vertex_attribute("labeldegree", (yyvsp[0].realnum), context)); } -#line 1987 "yy.tab.c" +#line 1987 "src/vendor/io/pajek-parser.c" break; case 35: /* vpword: VP_FONT parstrval */ @@ -1991,7 +1991,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_string_vertex_attribute("font", (yyvsp[0].string).str, (yyvsp[0].string).len, context)); } -#line 1995 "yy.tab.c" +#line 1995 "src/vendor/io/pajek-parser.c" break; case 36: /* vpword: VP_URL parstrval */ @@ -1999,7 +1999,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_string_vertex_attribute("url", (yyvsp[0].string).str, (yyvsp[0].string).len, context)); } -#line 2003 "yy.tab.c" +#line 2003 "src/vendor/io/pajek-parser.c" break; case 37: /* vpword: VP_IC parstrval */ @@ -2007,7 +2007,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_string_vertex_attribute("color", (yyvsp[0].string).str, (yyvsp[0].string).len, context)); } -#line 2011 "yy.tab.c" +#line 2011 "src/vendor/io/pajek-parser.c" break; case 38: /* vpword: VP_BC parstrval */ @@ -2015,7 +2015,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_string_vertex_attribute("framecolor", (yyvsp[0].string).str, (yyvsp[0].string).len, context)); } -#line 2019 "yy.tab.c" +#line 2019 "src/vendor/io/pajek-parser.c" break; case 39: /* vpword: VP_LC parstrval */ @@ -2023,7 +2023,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_string_vertex_attribute("labelcolor", (yyvsp[0].string).str, (yyvsp[0].string).len, context)); } -#line 2027 "yy.tab.c" +#line 2027 "src/vendor/io/pajek-parser.c" break; case 40: /* vpword: parname parstrval */ @@ -2041,25 +2041,25 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_FREE((yyvsp[-1].dynstr)); IGRAPH_FINALLY_CLEAN(1); } -#line 2045 "yy.tab.c" +#line 2045 "src/vendor/io/pajek-parser.c" break; case 47: /* arcs: "*Arcs line" "end of line" arcsdefs */ #line 338 "src/vendor/cigraph/src/io/pajek-parser.y" { context->directed=true; } -#line 2051 "yy.tab.c" +#line 2051 "src/vendor/io/pajek-parser.c" break; case 48: /* arcs: "*Arcs line" number "end of line" arcsdefs */ #line 339 "src/vendor/cigraph/src/io/pajek-parser.y" { context->directed=true; } -#line 2057 "yy.tab.c" +#line 2057 "src/vendor/io/pajek-parser.c" break; case 51: /* $@2: %empty */ #line 343 "src/vendor/cigraph/src/io/pajek-parser.y" { context->actedge++; } -#line 2063 "yy.tab.c" +#line 2063 "src/vendor/io/pajek-parser.c" break; case 52: /* arcsline: vertex vertex $@2 weight edgeparams "end of line" */ @@ -2067,25 +2067,25 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(igraph_vector_int_push_back(context->vector, (yyvsp[-5].intnum)-1)); IGRAPH_YY_CHECK(igraph_vector_int_push_back(context->vector, (yyvsp[-4].intnum)-1)); } -#line 2071 "yy.tab.c" +#line 2071 "src/vendor/io/pajek-parser.c" break; case 53: /* edges: "*Edges line" "end of line" edgesdefs */ #line 348 "src/vendor/cigraph/src/io/pajek-parser.y" { context->directed=0; } -#line 2077 "yy.tab.c" +#line 2077 "src/vendor/io/pajek-parser.c" break; case 54: /* edges: "*Edges line" number "end of line" edgesdefs */ #line 349 "src/vendor/cigraph/src/io/pajek-parser.y" { context->directed=0; } -#line 2083 "yy.tab.c" +#line 2083 "src/vendor/io/pajek-parser.c" break; case 57: /* $@3: %empty */ #line 353 "src/vendor/cigraph/src/io/pajek-parser.y" { context->actedge++; } -#line 2089 "yy.tab.c" +#line 2089 "src/vendor/io/pajek-parser.c" break; case 58: /* edgesline: vertex vertex $@3 weight edgeparams "end of line" */ @@ -2093,7 +2093,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(igraph_vector_int_push_back(context->vector, (yyvsp[-5].intnum)-1)); IGRAPH_YY_CHECK(igraph_vector_int_push_back(context->vector, (yyvsp[-4].intnum)-1)); } -#line 2097 "yy.tab.c" +#line 2097 "src/vendor/io/pajek-parser.c" break; case 60: /* weight: number */ @@ -2101,7 +2101,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_edge_attribute("weight", (yyvsp[0].realnum), context)); } -#line 2105 "yy.tab.c" +#line 2105 "src/vendor/io/pajek-parser.c" break; case 64: /* edgeparam: EP_S number */ @@ -2109,7 +2109,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_edge_attribute("arrowsize", (yyvsp[0].realnum), context)); } -#line 2113 "yy.tab.c" +#line 2113 "src/vendor/io/pajek-parser.c" break; case 65: /* edgeparam: EP_W number */ @@ -2117,7 +2117,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_edge_attribute("edgewidth", (yyvsp[0].realnum), context)); } -#line 2121 "yy.tab.c" +#line 2121 "src/vendor/io/pajek-parser.c" break; case 66: /* edgeparam: EP_H1 number */ @@ -2125,7 +2125,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_edge_attribute("hook1", (yyvsp[0].realnum), context)); } -#line 2129 "yy.tab.c" +#line 2129 "src/vendor/io/pajek-parser.c" break; case 67: /* edgeparam: EP_H2 number */ @@ -2133,7 +2133,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_edge_attribute("hook2", (yyvsp[0].realnum), context)); } -#line 2137 "yy.tab.c" +#line 2137 "src/vendor/io/pajek-parser.c" break; case 68: /* edgeparam: EP_A1 number */ @@ -2141,7 +2141,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_edge_attribute("angle1", (yyvsp[0].realnum), context)); } -#line 2145 "yy.tab.c" +#line 2145 "src/vendor/io/pajek-parser.c" break; case 69: /* edgeparam: EP_A2 number */ @@ -2149,7 +2149,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_edge_attribute("angle2", (yyvsp[0].realnum), context)); } -#line 2153 "yy.tab.c" +#line 2153 "src/vendor/io/pajek-parser.c" break; case 70: /* edgeparam: EP_K1 number */ @@ -2157,7 +2157,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_edge_attribute("velocity1", (yyvsp[0].realnum), context)); } -#line 2161 "yy.tab.c" +#line 2161 "src/vendor/io/pajek-parser.c" break; case 71: /* edgeparam: EP_K2 number */ @@ -2165,7 +2165,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_edge_attribute("velocity2", (yyvsp[0].realnum), context)); } -#line 2169 "yy.tab.c" +#line 2169 "src/vendor/io/pajek-parser.c" break; case 72: /* edgeparam: EP_AP number */ @@ -2173,7 +2173,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_edge_attribute("arrowpos", (yyvsp[0].realnum), context)); } -#line 2177 "yy.tab.c" +#line 2177 "src/vendor/io/pajek-parser.c" break; case 73: /* edgeparam: EP_LP number */ @@ -2181,7 +2181,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_edge_attribute("labelpos", (yyvsp[0].realnum), context)); } -#line 2185 "yy.tab.c" +#line 2185 "src/vendor/io/pajek-parser.c" break; case 74: /* edgeparam: EP_LR number */ @@ -2189,7 +2189,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_edge_attribute("labelangle", (yyvsp[0].realnum), context)); } -#line 2193 "yy.tab.c" +#line 2193 "src/vendor/io/pajek-parser.c" break; case 75: /* edgeparam: EP_LPHI number */ @@ -2197,7 +2197,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_edge_attribute("labelangle2", (yyvsp[0].realnum), context)); } -#line 2201 "yy.tab.c" +#line 2201 "src/vendor/io/pajek-parser.c" break; case 76: /* edgeparam: EP_LA number */ @@ -2205,7 +2205,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_edge_attribute("labeldegree", (yyvsp[0].realnum), context)); } -#line 2209 "yy.tab.c" +#line 2209 "src/vendor/io/pajek-parser.c" break; case 77: /* edgeparam: EP_FOS number */ @@ -2213,7 +2213,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_numeric_edge_attribute("fontsize", (yyvsp[0].realnum), context)); } -#line 2217 "yy.tab.c" +#line 2217 "src/vendor/io/pajek-parser.c" break; case 78: /* epword: EP_A parstrval */ @@ -2221,7 +2221,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_string_edge_attribute("arrowtype", (yyvsp[0].string).str, (yyvsp[0].string).len, context)); } -#line 2225 "yy.tab.c" +#line 2225 "src/vendor/io/pajek-parser.c" break; case 79: /* epword: EP_P parstrval */ @@ -2229,7 +2229,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_string_edge_attribute("linepattern", (yyvsp[0].string).str, (yyvsp[0].string).len, context)); } -#line 2233 "yy.tab.c" +#line 2233 "src/vendor/io/pajek-parser.c" break; case 80: /* epword: EP_L parstrval */ @@ -2237,7 +2237,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_string_edge_attribute("label", (yyvsp[0].string).str, (yyvsp[0].string).len, context)); } -#line 2241 "yy.tab.c" +#line 2241 "src/vendor/io/pajek-parser.c" break; case 81: /* epword: EP_LC parstrval */ @@ -2245,7 +2245,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_string_edge_attribute("labelcolor", (yyvsp[0].string).str, (yyvsp[0].string).len, context)); } -#line 2249 "yy.tab.c" +#line 2249 "src/vendor/io/pajek-parser.c" break; case 82: /* epword: EP_C parstrval */ @@ -2253,7 +2253,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_string_edge_attribute("color", (yyvsp[0].string).str, (yyvsp[0].string).len, context)); } -#line 2257 "yy.tab.c" +#line 2257 "src/vendor/io/pajek-parser.c" break; case 83: /* epword: EP_FONT parstrval */ @@ -2261,7 +2261,7 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(add_string_edge_attribute("font", (yyvsp[0].string).str, (yyvsp[0].string).len, context)); } -#line 2265 "yy.tab.c" +#line 2265 "src/vendor/io/pajek-parser.c" break; case 84: /* epword: parname parstrval */ @@ -2279,19 +2279,19 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_FREE((yyvsp[-1].dynstr)); IGRAPH_FINALLY_CLEAN(1); } -#line 2283 "yy.tab.c" +#line 2283 "src/vendor/io/pajek-parser.c" break; case 85: /* arcslist: "*Arcslist line" "end of line" arcslistlines */ #line 443 "src/vendor/cigraph/src/io/pajek-parser.y" { context->directed=true; } -#line 2289 "yy.tab.c" +#line 2289 "src/vendor/io/pajek-parser.c" break; case 91: /* arclistfrom: integer */ #line 451 "src/vendor/cigraph/src/io/pajek-parser.y" { context->actfrom=labs((yyvsp[0].intnum))-1; } -#line 2295 "yy.tab.c" +#line 2295 "src/vendor/io/pajek-parser.c" break; case 92: /* arclistto: integer */ @@ -2300,19 +2300,19 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_YY_CHECK(igraph_vector_int_push_back(context->vector, context->actfrom)); IGRAPH_YY_CHECK(igraph_vector_int_push_back(context->vector, labs((yyvsp[0].intnum))-1)); } -#line 2304 "yy.tab.c" +#line 2304 "src/vendor/io/pajek-parser.c" break; case 93: /* edgeslist: "*Edgeslist line" "end of line" edgelistlines */ #line 458 "src/vendor/cigraph/src/io/pajek-parser.y" { context->directed=0; } -#line 2310 "yy.tab.c" +#line 2310 "src/vendor/io/pajek-parser.c" break; case 99: /* edgelistfrom: integer */ #line 466 "src/vendor/cigraph/src/io/pajek-parser.y" { context->actfrom=labs((yyvsp[0].intnum))-1; } -#line 2316 "yy.tab.c" +#line 2316 "src/vendor/io/pajek-parser.c" break; case 100: /* edgelistto: integer */ @@ -2321,7 +2321,7 @@ YYLTYPE yylloc = yyloc_default; IGRAPH_YY_CHECK(igraph_vector_int_push_back(context->vector, context->actfrom)); IGRAPH_YY_CHECK(igraph_vector_int_push_back(context->vector, labs((yyvsp[0].intnum))-1)); } -#line 2325 "yy.tab.c" +#line 2325 "src/vendor/io/pajek-parser.c" break; case 102: /* matrixline: "*Matrix line" */ @@ -2330,13 +2330,13 @@ YYLTYPE yylloc = yyloc_default; context->actto=0; context->directed=(context->vcount2==0); } -#line 2334 "yy.tab.c" +#line 2334 "src/vendor/io/pajek-parser.c" break; case 105: /* adjmatrixline: adjmatrixnumbers "end of line" */ #line 484 "src/vendor/cigraph/src/io/pajek-parser.y" { context->actfrom++; context->actto=0; } -#line 2340 "yy.tab.c" +#line 2340 "src/vendor/io/pajek-parser.c" break; case 108: /* adjmatrixentry: number */ @@ -2358,7 +2358,7 @@ YYLTYPE yylloc = yyloc_default; } context->actto++; } -#line 2362 "yy.tab.c" +#line 2362 "src/vendor/io/pajek-parser.c" break; case 109: /* integer: "number" */ @@ -2370,7 +2370,7 @@ YYLTYPE yylloc = yyloc_default; &val)); (yyval.intnum)=val; } -#line 2374 "yy.tab.c" +#line 2374 "src/vendor/io/pajek-parser.c" break; case 110: /* number: "number" */ @@ -2382,7 +2382,7 @@ YYLTYPE yylloc = yyloc_default; &val)); (yyval.realnum)=val; } -#line 2386 "yy.tab.c" +#line 2386 "src/vendor/io/pajek-parser.c" break; case 111: /* parname: word */ @@ -2390,38 +2390,38 @@ YYLTYPE yylloc = yyloc_default; { IGRAPH_YY_CHECK(make_dynstr((yyvsp[0].string).str, (yyvsp[0].string).len, &(yyval.dynstr))); } -#line 2394 "yy.tab.c" +#line 2394 "src/vendor/io/pajek-parser.c" break; case 112: /* parstrval: word */ #line 528 "src/vendor/cigraph/src/io/pajek-parser.y" { (yyval.string)=(yyvsp[0].string); } -#line 2400 "yy.tab.c" +#line 2400 "src/vendor/io/pajek-parser.c" break; case 113: /* word: "word" */ #line 530 "src/vendor/cigraph/src/io/pajek-parser.y" { (yyval.string).str=igraph_pajek_yyget_text(scanner); (yyval.string).len=igraph_pajek_yyget_leng(scanner); } -#line 2407 "yy.tab.c" +#line 2407 "src/vendor/io/pajek-parser.c" break; case 114: /* word: "number" */ #line 532 "src/vendor/cigraph/src/io/pajek-parser.y" { (yyval.string).str=igraph_pajek_yyget_text(scanner); (yyval.string).len=igraph_pajek_yyget_leng(scanner); } -#line 2414 "yy.tab.c" +#line 2414 "src/vendor/io/pajek-parser.c" break; case 115: /* word: "quoted string" */ #line 534 "src/vendor/cigraph/src/io/pajek-parser.y" { (yyval.string).str=igraph_pajek_yyget_text(scanner)+1; (yyval.string).len=igraph_pajek_yyget_leng(scanner)-2; } -#line 2421 "yy.tab.c" +#line 2421 "src/vendor/io/pajek-parser.c" break; -#line 2425 "yy.tab.c" +#line 2425 "src/vendor/io/pajek-parser.c" default: break; } diff --git a/src/vendor/io/parsers/dl-parser.h b/src/vendor/io/parsers/dl-parser.h index a7098021132..46dac54e14b 100644 --- a/src/vendor/io/parsers/dl-parser.h +++ b/src/vendor/io/parsers/dl-parser.h @@ -35,8 +35,8 @@ especially those whose name start with YY_ or yy_. They are private implementation details that can be changed or removed. */ -#ifndef YY_IGRAPH_DL_YY_YY_TAB_H_INCLUDED -# define YY_IGRAPH_DL_YY_YY_TAB_H_INCLUDED +#ifndef YY_IGRAPH_DL_YY_SRC_VENDOR_IO_DL_PARSER_H_INCLUDED +# define YY_IGRAPH_DL_YY_SRC_VENDOR_IO_DL_PARSER_H_INCLUDED /* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -81,7 +81,7 @@ union YYSTYPE igraph_integer_t integer; igraph_real_t real; -#line 85 "yy.tab.h" +#line 85 "src/vendor/io/dl-parser.h" }; typedef union YYSTYPE YYSTYPE; @@ -109,4 +109,4 @@ struct YYLTYPE int igraph_dl_yyparse (igraph_i_dl_parsedata_t* context); -#endif /* !YY_IGRAPH_DL_YY_YY_TAB_H_INCLUDED */ +#endif /* !YY_IGRAPH_DL_YY_SRC_VENDOR_IO_DL_PARSER_H_INCLUDED */ diff --git a/src/vendor/io/parsers/gml-parser.h b/src/vendor/io/parsers/gml-parser.h index b42a67b404d..1e4194ef4ec 100644 --- a/src/vendor/io/parsers/gml-parser.h +++ b/src/vendor/io/parsers/gml-parser.h @@ -35,8 +35,8 @@ especially those whose name start with YY_ or yy_. They are private implementation details that can be changed or removed. */ -#ifndef YY_IGRAPH_GML_YY_YY_TAB_H_INCLUDED -# define YY_IGRAPH_GML_YY_YY_TAB_H_INCLUDED +#ifndef YY_IGRAPH_GML_YY_SRC_VENDOR_IO_GML_PARSER_H_INCLUDED +# define YY_IGRAPH_GML_YY_SRC_VENDOR_IO_GML_PARSER_H_INCLUDED /* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -74,7 +74,7 @@ union YYSTYPE igraph_gml_tree_t *tree; igraph_real_t real; -#line 78 "yy.tab.h" +#line 78 "src/vendor/io/gml-parser.h" }; typedef union YYSTYPE YYSTYPE; @@ -102,4 +102,4 @@ struct YYLTYPE int igraph_gml_yyparse (igraph_i_gml_parsedata_t* context); -#endif /* !YY_IGRAPH_GML_YY_YY_TAB_H_INCLUDED */ +#endif /* !YY_IGRAPH_GML_YY_SRC_VENDOR_IO_GML_PARSER_H_INCLUDED */ diff --git a/src/vendor/io/parsers/lgl-parser.h b/src/vendor/io/parsers/lgl-parser.h index c439e5ed6b0..b391c8fac2b 100644 --- a/src/vendor/io/parsers/lgl-parser.h +++ b/src/vendor/io/parsers/lgl-parser.h @@ -35,8 +35,8 @@ especially those whose name start with YY_ or yy_. They are private implementation details that can be changed or removed. */ -#ifndef YY_IGRAPH_LGL_YY_YY_TAB_H_INCLUDED -# define YY_IGRAPH_LGL_YY_YY_TAB_H_INCLUDED +#ifndef YY_IGRAPH_LGL_YY_SRC_VENDOR_IO_LGL_PARSER_H_INCLUDED +# define YY_IGRAPH_LGL_YY_SRC_VENDOR_IO_LGL_PARSER_H_INCLUDED /* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -71,7 +71,7 @@ union YYSTYPE igraph_integer_t edgenum; igraph_real_t weightnum; -#line 75 "yy.tab.h" +#line 75 "src/vendor/io/lgl-parser.h" }; typedef union YYSTYPE YYSTYPE; @@ -99,4 +99,4 @@ struct YYLTYPE int igraph_lgl_yyparse (igraph_i_lgl_parsedata_t* context); -#endif /* !YY_IGRAPH_LGL_YY_YY_TAB_H_INCLUDED */ +#endif /* !YY_IGRAPH_LGL_YY_SRC_VENDOR_IO_LGL_PARSER_H_INCLUDED */ diff --git a/src/vendor/io/parsers/ncol-parser.h b/src/vendor/io/parsers/ncol-parser.h index b8f2c8e1487..361262035fe 100644 --- a/src/vendor/io/parsers/ncol-parser.h +++ b/src/vendor/io/parsers/ncol-parser.h @@ -35,8 +35,8 @@ especially those whose name start with YY_ or yy_. They are private implementation details that can be changed or removed. */ -#ifndef YY_IGRAPH_NCOL_YY_YY_TAB_H_INCLUDED -# define YY_IGRAPH_NCOL_YY_YY_TAB_H_INCLUDED +#ifndef YY_IGRAPH_NCOL_YY_SRC_VENDOR_IO_NCOL_PARSER_H_INCLUDED +# define YY_IGRAPH_NCOL_YY_SRC_VENDOR_IO_NCOL_PARSER_H_INCLUDED /* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -70,7 +70,7 @@ union YYSTYPE igraph_integer_t edgenum; igraph_real_t weightnum; -#line 74 "yy.tab.h" +#line 74 "src/vendor/io/ncol-parser.h" }; typedef union YYSTYPE YYSTYPE; @@ -98,4 +98,4 @@ struct YYLTYPE int igraph_ncol_yyparse (igraph_i_ncol_parsedata_t* context); -#endif /* !YY_IGRAPH_NCOL_YY_YY_TAB_H_INCLUDED */ +#endif /* !YY_IGRAPH_NCOL_YY_SRC_VENDOR_IO_NCOL_PARSER_H_INCLUDED */ diff --git a/src/vendor/io/parsers/pajek-parser.h b/src/vendor/io/parsers/pajek-parser.h index 46a27e2663d..79385e2e367 100644 --- a/src/vendor/io/parsers/pajek-parser.h +++ b/src/vendor/io/parsers/pajek-parser.h @@ -35,8 +35,8 @@ especially those whose name start with YY_ or yy_. They are private implementation details that can be changed or removed. */ -#ifndef YY_IGRAPH_PAJEK_YY_YY_TAB_H_INCLUDED -# define YY_IGRAPH_PAJEK_YY_YY_TAB_H_INCLUDED +#ifndef YY_IGRAPH_PAJEK_YY_SRC_VENDOR_IO_PAJEK_PARSER_H_INCLUDED +# define YY_IGRAPH_PAJEK_YY_SRC_VENDOR_IO_PAJEK_PARSER_H_INCLUDED /* Debug traces. */ #ifndef YYDEBUG # define YYDEBUG 0 @@ -119,7 +119,7 @@ union YYSTYPE } string; char *dynstr; -#line 123 "yy.tab.h" +#line 123 "src/vendor/io/pajek-parser.h" }; typedef union YYSTYPE YYSTYPE; @@ -147,4 +147,4 @@ struct YYLTYPE int igraph_pajek_yyparse (igraph_i_pajek_parsedata_t* context); -#endif /* !YY_IGRAPH_PAJEK_YY_YY_TAB_H_INCLUDED */ +#endif /* !YY_IGRAPH_PAJEK_YY_SRC_VENDOR_IO_PAJEK_PARSER_H_INCLUDED */ diff --git a/tools/stimulus/igraph_export.h b/tools/stimulus/igraph_export.h index 508cb6eeede..376a91cf529 100644 --- a/tools/stimulus/igraph_export.h +++ b/tools/stimulus/igraph_export.h @@ -4,7 +4,7 @@ #define IGRAPH_EXPORT #define IGRAPH_NO_EXPORT -#define IGRAPH_DEPRECATED __attribute__ ((__deprecated__)) +#define IGRAPH_DEPRECATED #define IGRAPH_DEPRECATED_EXPORT IGRAPH_EXPORT IGRAPH_DEPRECATED #define IGRAPH_DEPRECATED_NO_EXPORT IGRAPH_NO_EXPORT IGRAPH_DEPRECATED