Switch to C .gitignore

Fix enum & union issues from previous commit
Switch to C .gitignore
Remove old make targets

Author: Phlarx

.gitignore

@@ -1,101 +1,57 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
+# Prerequisites
+*.d
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Linker output
+*.ilk
+*.map
+*.exp
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
 *.so
-
-# Distribution / packaging
-.Python
-env/
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-.hypothesis/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# pyenv
-.python-version
-
-# celery beat schedule file
-celerybeat-schedule
-
-# SageMath parsed files
-*.sage.py
-
-# dotenv
-.env
-
-# virtualenv
-.venv
-venv/
-ENV/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+tis
+tis.f
+
+# Debug files
+*.dSYM/
+*.su
+*.idb
+*.pdb
+
+# Kernel Module Compile Results
+*.mod*
+*.cmd
+.tmp_versions/
+modules.order
+Module.symvers
+Mkfile.old
+dkms.conf
+
+# Editor files
+*.swp

Makefile

@@ -12,24 +12,12 @@ tis_io.o: tis_types.h
 tis_node.o: tis_types.h tis_node.h tis_ops.h tis_io.h
 tis_ops.o: tis_types.h tis_node.h
 
-tis.f: tis.f.o tis_io.o tis_node.o tis_ops.o
-	${CC} $^ -o $@
-tis.f.o: tis_types.h tis_node.h
-tis.f.c: tis.c tis_types.h tis_ops.h
-	grep "#include <" $< > $@
-	grep -v "#include <" $< > tis.temp.c
-	${CPP} tis.temp.c -o tis.temp.i
-	grep -v "^#" tis.temp.i >> $@
-	-${RM} tis.temp.c tis.temp.i
+all: tis
 
-all: tis tis.f
-
-clean: cleanobj cleanexe cleanf
+clean: cleanobj cleanexe
 cleanobj:
 	-${RM} ${OBJECTS}
 cleanexe:
 	-${RM} tis
-cleanf:
-	-${RM} tis.f tis.f.o tis.f.c
 
-.PHONY: all clean cleanobj cleanexe cleanf
+.PHONY: all clean cleanobj cleanexe

tis.c

@@ -247,11 +247,11 @@ int init_layout(tis_t* tis, char* layoutfile, int layoutmode) {
         // set first input to TIS_IO_TYPE_IOSTREAM_NUMERIC
         tis->inputs[0] = calloc(1, sizeof(tis_io_node_t));
         tis->inputs[0]->type = TIS_IO_TYPE_IOSTREAM_ASCII;
-        tis->inputs[0]->file = stdin;
+        tis->inputs[0]->file.file = stdin;
         // set last output to TIS_IO_TYPE_IOSTREAM_NUMERIC
         tis->outputs[tis->cols - 1] = calloc(1, sizeof(tis_io_node_t));
         tis->outputs[tis->cols - 1]->type = TIS_IO_TYPE_IOSTREAM_ASCII;
-        tis->outputs[tis->cols - 1]->file = stdout;
+        tis->outputs[tis->cols - 1]->file.file = stdout;
     }
 
     return INIT_OK;

tis_io.c

@@ -21,11 +21,13 @@ tis_op_result_t input(tis_io_node_t* io, int* value) {
             }
             *value = clamp(in);
             break;
-        case TIS_IO_TYPE_IGENERATOR_ALGEBRAIC:
-        case TIS_IO_TYPE_IGENERATOR_CONSTANT:
+        case TIS_IO_TYPE_IGENERATOR_LIST:
         case TIS_IO_TYPE_IGENERATOR_CYCLIC:
         case TIS_IO_TYPE_IGENERATOR_RANDOM:
-        case TIS_IO_TYPE_IGENERATOR_SEQUENCE:
+        case TIS_IO_TYPE_IGENERATOR_ALGEBRAIC:
+        case TIS_IO_TYPE_IGENERATOR_GEOMETRIC:
+        case TIS_IO_TYPE_IGENERATOR_HARMONIC:
+        case TIS_IO_TYPE_IGENERATOR_OEIS:
         default:
             error("Not yet implemented\n");
             return TIS_OP_RESULT_ERR;