Reorganize repository.

jfeser · Feb 1, 2019 · eb7288d · eb7288d
1 parent 3c82b16
commit eb7288d
Show file tree

Hide file tree

Showing 80 changed files with 19 additions and 363 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,190 +1,3 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.sln.docstates
-.vagrant/
-
-# Xamarin Studio / monodevelop user-specific
-*.userprefs
-
-# Build results
-
-[Dd]ebug/
-[Rr]elease/
-x64/
-build/
-[Bb]in/
-[Oo]bj/
-
-# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
-!packages/*/build/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-*_i.c
-*_p.c
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.log
-*.scc
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# NCrunch
-*.ncrunch*
-.*crunch*.local.xml
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.Publish.xml
-
-# Enable nuget.exe in the .nuget folder (though normally executables are not tracked)
-!.nuget/NuGet.exe
-
-# Windows Azure Build Output
-csx
-*.build.csdef
-
-# Windows Store app package directory
-AppPackages/
-
-# Others
-sql/
-*.Cache
-ClientBin/
-[Ss]tyle[Cc]op.*
-~$*
-*~
-*.dbmdl
-*.[Pp]ublish.xml
-*.pfx
-*.publishsettings
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file to a newer
-# Visual Studio version. Backup files are not needed, because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-App_Data/*.mdf
-App_Data/*.ldf
-
-
-#LightSwitch generated files
-GeneratedArtifacts/
-_Pvt_Extensions/
-ModelManifest.xml
-
-# =========================
-# Windows detritus
-# =========================
-
-# Windows image file caches
-Thumbs.db
-ehthumbs.db
-
-# Folder config file
-Desktop.ini
-
-# Recycle Bin used on file shares
-$RECYCLE.BIN/
-
-# Mac desktop service store files
-.DS_Store
-
-# ===================================================
-# Exclude F# project specific directories and files
-# ===================================================
-
-# NuGet Packages Directory
-packages/
-
-# Generated documentation folder
-docs/output/
-
-# Temp folder used for publishing docs
-temp/
-
-# Test results produced by build
-TestResults.xml
-
-# Nuget outputs
-nuget/*.nupkg
-release.cmd
-release.sh
-localpackages/
-paket-files
-*.orig
-.paket/paket.exe
-docs/content/license.md
-docs/content/release-notes.md
-
 # =========================
 # Ocaml build files
 # =========================
@@ -199,145 +12,5 @@ _build/
 setup.data
 setup.log
 
-# =========================
-# Latex files
-# =========================
-
-## Core latex/pdflatex auxiliary files:
-*.aux
-*.lof
-*.log
-*.lot
-*.fls
-*.out
-*.toc
-
-## Intermediate documents:
-*.dvi
-*-converted-to.*
-# these rules might exclude image files for figures etc.
-# *.ps
-# *.eps
-# *.pdf
-
-## Bibliography auxiliary files (bibtex/biblatex/biber):
-*.bbl
-*.bcf
-*.blg
-*-blx.aux
-*-blx.bib
-*.brf
-*.run.xml
-
-## Build tool auxiliary files:
-*.fdb_latexmk
-*.synctex
-*.synctex.gz
-*.synctex.gz(busy)
-*.pdfsync
-
-## Auxiliary and intermediate files from other packages:
-
-# algorithms
-*.alg
-*.loa
-
-# achemso
-acs-*.bib
-
-# amsthm
-*.thm
-
-# beamer
-*.nav
-*.snm
-*.vrb
-
-#(e)ledmac/(e)ledpar
-*.end
-*.[1-9]
-*.[1-9][0-9]
-*.[1-9][0-9][0-9]
-*.[1-9]R
-*.[1-9][0-9]R
-*.[1-9][0-9][0-9]R
-*.eledsec[1-9]
-*.eledsec[1-9]R
-*.eledsec[1-9][0-9]
-*.eledsec[1-9][0-9]R
-*.eledsec[1-9][0-9][0-9]
-*.eledsec[1-9][0-9][0-9]R
-
-# glossaries
-*.acn
-*.acr
-*.glg
-*.glo
-*.gls
-
-# gnuplottex
-*-gnuplottex-*
-
-# hyperref
-*.brf
-
-# knitr
-*-concordance.tex
-*.tikz
-*-tikzDictionary
-
-# listings
-*.lol
-
-# makeidx
-*.idx
-*.ilg
-*.ind
-*.ist
-
-# minitoc
-*.maf
-*.mtc
-*.mtc0
-
-# minted
-_minted*
-*.pyg
-
-# morewrites
-*.mw
-
-# nomencl
-*.nlo
-
-# sagetex
-*.sagetex.sage
-*.sagetex.py
-*.sagetex.scmd
-
-# sympy
-*.sout
-*.sympy
-sympy-plots-for-*.tex/
-
-# todonotes
-*.tdo
-
-# xindy
-*.xdy
-
-# WinEdt
-*.bak
-*.sav
-
-pldi2015 student research/auto
-*.pptx
-tests
-
-coverage/
-component-specs
-
-*.json
-*.sexp
 .merlin
 *.install
diff --git a/src/benchmark.py → bin/benchmark.py b/src/benchmark.py → bin/benchmark.py
diff --git a/src/l2-cli/dune → bin/dune b/src/l2-cli/dune → bin/dune
@@ -1,6 +1,7 @@
 (executable
  (name l2_cli)
  (libraries l2 core core_extended yojson hashcons)
+ (modules l2_cli)
  (preprocess (pps ppx_jane)))
 
 (install

diff --git a/src/l2-lib/example_gen.py → bin/example_gen.py b/src/l2-lib/example_gen.py → bin/example_gen.py
diff --git a/src/scripts/generate_functions.ml → bin/generate_functions.ml b/src/scripts/generate_functions.ml → bin/generate_functions.ml
diff --git a/src/scripts/generate_values.ml → bin/generate_values.ml b/src/scripts/generate_values.ml → bin/generate_values.ml
diff --git a/src/l2-cli/l2_cli.ml → bin/l2_cli.ml b/src/l2-cli/l2_cli.ml → bin/l2_cli.ml
diff --git a/src/l2-lib/ast.ml → lib/ast.ml b/src/l2-lib/ast.ml → lib/ast.ml
diff --git a/src/l2-lib/automaton.ml → lib/automaton.ml b/src/l2-lib/automaton.ml → lib/automaton.ml
diff --git a/src/l2-lib/collections.ml → lib/collections.ml b/src/l2-lib/collections.ml → lib/collections.ml
diff --git a/src/l2-lib/combinat.ml → lib/combinat.ml b/src/l2-lib/combinat.ml → lib/combinat.ml
diff --git a/src/l2-lib/combinat.mli → lib/combinat.mli b/src/l2-lib/combinat.mli → lib/combinat.mli
diff --git a/src/l2-lib/config.ml → lib/config.ml b/src/l2-lib/config.ml → lib/config.ml
diff --git a/src/l2-lib/config.mli → lib/config.mli b/src/l2-lib/config.mli → lib/config.mli
diff --git a/src/l2-lib/dune → lib/dune b/src/l2-lib/dune → lib/dune
diff --git a/src/l2-lib/eval.ml → lib/eval.ml b/src/l2-lib/eval.ml → lib/eval.ml
diff --git a/src/l2-lib/eval.mli → lib/eval.mli b/src/l2-lib/eval.mli → lib/eval.mli
diff --git a/src/l2-lib/example.ml → lib/example.ml b/src/l2-lib/example.ml → lib/example.ml
diff --git a/src/l2-lib/example.mli → lib/example.mli b/src/l2-lib/example.mli → lib/example.mli
diff --git a/src/l2-lib/example_deduction.ml → lib/example_deduction.ml b/src/l2-lib/example_deduction.ml → lib/example_deduction.ml
diff --git a/src/l2-lib/example_deduction.mli → lib/example_deduction.mli b/src/l2-lib/example_deduction.mli → lib/example_deduction.mli
diff --git a/src/l2-lib/expr.ml → lib/expr.ml b/src/l2-lib/expr.ml → lib/expr.ml
diff --git a/src/l2-lib/exprValue.ml → lib/exprValue.ml b/src/l2-lib/exprValue.ml → lib/exprValue.ml
diff --git a/src/l2-lib/exprValue.mli → lib/exprValue.mli b/src/l2-lib/exprValue.mli → lib/exprValue.mli
diff --git a/src/l2-lib/fast_example_deduction.ml → lib/fast_example_deduction.ml b/src/l2-lib/fast_example_deduction.ml → lib/fast_example_deduction.ml
diff --git a/src/l2-lib/generate_functions.ml → lib/generate_functions.ml b/src/l2-lib/generate_functions.ml → lib/generate_functions.ml
diff --git a/src/l2-lib/higher_order_deduction.ml → lib/higher_order_deduction.ml b/src/l2-lib/higher_order_deduction.ml → lib/higher_order_deduction.ml
diff --git a/src/l2-lib/higher_order_deduction.mli → lib/higher_order_deduction.mli b/src/l2-lib/higher_order_deduction.mli → lib/higher_order_deduction.mli
diff --git a/src/l2-lib/hypothesis.ml → lib/hypothesis.ml b/src/l2-lib/hypothesis.ml → lib/hypothesis.ml
diff --git a/src/l2-lib/hypothesis.mli → lib/hypothesis.mli b/src/l2-lib/hypothesis.mli → lib/hypothesis.mli
diff --git a/src/l2-lib/infer.ml → lib/infer.ml b/src/l2-lib/infer.ml → lib/infer.ml
diff --git a/src/l2-lib/infer.mli → lib/infer.mli b/src/l2-lib/infer.mli → lib/infer.mli
diff --git a/src/l2-lib/input_deduction.ml → lib/input_deduction.ml b/src/l2-lib/input_deduction.ml → lib/input_deduction.ml
diff --git a/src/l2-lib/input_deduction.mli → lib/input_deduction.mli b/src/l2-lib/input_deduction.mli → lib/input_deduction.mli
diff --git a/src/l2-lib/lexer_ml.mll → lib/lexer_ml.mll b/src/l2-lib/lexer_ml.mll → lib/lexer_ml.mll
diff --git a/src/l2-lib/lexer_sexp.mll → lib/lexer_sexp.mll b/src/l2-lib/lexer_sexp.mll → lib/lexer_sexp.mll
diff --git a/src/l2-lib/library.ml → lib/library.ml b/src/l2-lib/library.ml → lib/library.ml
diff --git a/src/l2-lib/library.mli → lib/library.mli b/src/l2-lib/library.mli → lib/library.mli
diff --git a/src/l2-lib/parser_ml.mly → lib/parser_ml.mly b/src/l2-lib/parser_ml.mly → lib/parser_ml.mly
diff --git a/src/l2-lib/parser_sexp.mly → lib/parser_sexp.mly b/src/l2-lib/parser_sexp.mly → lib/parser_sexp.mly
diff --git a/src/l2-lib/random_deduction.ml → lib/random_deduction.ml b/src/l2-lib/random_deduction.ml → lib/random_deduction.ml
diff --git a/src/l2-lib/random_deduction.mli → lib/random_deduction.mli b/src/l2-lib/random_deduction.mli → lib/random_deduction.mli
diff --git a/src/l2-lib/recursive_spec_deduction.ml → lib/recursive_spec_deduction.ml b/src/l2-lib/recursive_spec_deduction.ml → lib/recursive_spec_deduction.ml
diff --git a/src/l2-lib/rewrite.ml → lib/rewrite.ml b/src/l2-lib/rewrite.ml → lib/rewrite.ml
diff --git a/src/l2-lib/sstream.ml → lib/sstream.ml b/src/l2-lib/sstream.ml → lib/sstream.ml
diff --git a/src/l2-lib/status.ml → lib/status.ml b/src/l2-lib/status.ml → lib/status.ml
diff --git a/src/l2-lib/status.mli → lib/status.mli b/src/l2-lib/status.mli → lib/status.mli
diff --git a/src/l2-lib/structure.ml → lib/structure.ml b/src/l2-lib/structure.ml → lib/structure.ml
diff --git a/src/l2-lib/symbolic_execution.ml → lib/symbolic_execution.ml b/src/l2-lib/symbolic_execution.ml → lib/symbolic_execution.ml
diff --git a/src/l2-lib/synthesis_common.ml → lib/synthesis_common.ml b/src/l2-lib/synthesis_common.ml → lib/synthesis_common.ml
diff --git a/src/l2-lib/synthesis_common.mli → lib/synthesis_common.mli b/src/l2-lib/synthesis_common.mli → lib/synthesis_common.mli
diff --git a/src/l2-lib/testcase.ml → lib/testcase.ml b/src/l2-lib/testcase.ml → lib/testcase.ml
diff --git a/src/l2-lib/testcase.mli → lib/testcase.mli b/src/l2-lib/testcase.mli → lib/testcase.mli
diff --git a/src/l2-lib/unify.ml → lib/unify.ml b/src/l2-lib/unify.ml → lib/unify.ml
diff --git a/src/l2-lib/util.ml → lib/util.ml b/src/l2-lib/util.ml → lib/util.ml
diff --git a/src/l2-lib/v1_engine.ml → lib/v1_engine.ml b/src/l2-lib/v1_engine.ml → lib/v1_engine.ml
diff --git a/src/l2-lib/v1_engine.mli → lib/v1_engine.mli b/src/l2-lib/v1_engine.mli → lib/v1_engine.mli
diff --git a/src/l2-lib/v1_solver_engine.ml → lib/v1_solver_engine.ml b/src/l2-lib/v1_solver_engine.ml → lib/v1_solver_engine.ml
diff --git a/src/l2-lib/v1_solver_engine.mli → lib/v1_solver_engine.mli b/src/l2-lib/v1_solver_engine.mli → lib/v1_solver_engine.mli
diff --git a/src/l2-lib/v2_engine.ml → lib/v2_engine.ml b/src/l2-lib/v2_engine.ml → lib/v2_engine.ml
diff --git a/src/l2-lib/v2_engine.mli → lib/v2_engine.mli b/src/l2-lib/v2_engine.mli → lib/v2_engine.mli
diff --git a/src/l2-lib/value.ml → lib/value.ml b/src/l2-lib/value.ml → lib/value.ml
diff --git a/src/l2-lib/value.mli → lib/value.mli b/src/l2-lib/value.mli → lib/value.mli
diff --git a/src/l2-lib/verify.ml → lib/verify.ml b/src/l2-lib/verify.ml → lib/verify.ml
diff --git a/src/paramils/crossvalidate.py → paramils/crossvalidate.py b/src/paramils/crossvalidate.py → paramils/crossvalidate.py
diff --git a/src/paramils/instances.txt → paramils/instances.txt b/src/paramils/instances.txt → paramils/instances.txt
diff --git a/src/paramils/l2_wrapper.py → paramils/l2_wrapper.py b/src/paramils/l2_wrapper.py → paramils/l2_wrapper.py
diff --git a/src/paramils/params.txt → paramils/params.txt b/src/paramils/params.txt → paramils/params.txt
diff --git a/src/paramils/scenario.txt → paramils/scenario.txt b/src/paramils/scenario.txt → paramils/scenario.txt
diff --git a/src/scripts/.merlin b/src/scripts/.merlin
diff --git a/src/l2-tests/collections_tests.ml → test/collections_tests.ml b/src/l2-tests/collections_tests.ml → test/collections_tests.ml
diff --git a/src/l2-tests/dune → test/dune b/src/l2-tests/dune → test/dune
@@ -1,4 +1,4 @@
-(executable
+(test
  (name tests)
  (libraries l2 oUnit core core_extended yojson hashcons)
- (preprocess (pps ppx_jane)))
+ (preprocess (pps ppx_jane)))
diff --git a/src/l2-tests/eval_tests.ml → test/eval_tests.ml b/src/l2-tests/eval_tests.ml → test/eval_tests.ml