From 1c0a076855f4c95e6213ac6637d83de49a6472c0 Mon Sep 17 00:00:00 2001 From: Virgil Serbanuta Date: Fri, 23 Aug 2024 01:57:37 +0300 Subject: [PATCH] REname Execution too preprocessing --- Makefile | 18 ++++++++---------- tests/{execution => preprocessing}/empty.rs | 0 .../function-arguments.rs | 0 .../function-return-type.rs | 0 4 files changed, 8 insertions(+), 10 deletions(-) rename tests/{execution => preprocessing}/empty.rs (100%) rename tests/{execution => preprocessing}/function-arguments.rs (100%) rename tests/{execution => preprocessing}/function-return-type.rs (100%) diff --git a/Makefile b/Makefile index d5f00d3..efd9b0e 100644 --- a/Makefile +++ b/Makefile @@ -3,16 +3,15 @@ RUST_KOMPILED ::= .build/rust-kompiled RUST_TIMESTAMP ::= $(RUST_KOMPILED)/timestamp SYNTAX_INPUT_DIR ::= tests/syntax SYNTAX_OUTPUT_DIR ::= .build/syntax-output -EXECUTION_INPUT_DIR ::= tests/execution -EXECUTION_OUTPUT_DIR ::= .build/execution-output +PREPROCESSING_INPUT_DIR ::= tests/preprocessing +PREPROCESSING_OUTPUT_DIR ::= .build/preprocessing-output SYNTAX_INPUTS ::= $(wildcard $(SYNTAX_INPUT_DIR)/*.rs) SYNTAX_OUTPUTS ::= $(patsubst $(SYNTAX_INPUT_DIR)/%.rs,$(SYNTAX_OUTPUT_DIR)/%.rs-parsed,$(SYNTAX_INPUTS)) -EXECUTION_INPUTS ::= $(wildcard $(EXECUTION_INPUT_DIR)/*.rs) -EXECUTION_OUTPUTS ::= $(patsubst $(EXECUTION_INPUT_DIR)/%.rs,$(EXECUTION_OUTPUT_DIR)/%.rs.executed.kore,$(EXECUTION_INPUTS)) -INDEXING_OUTPUTS ::= $(patsubst %.rs.executed.kore,%.rs.indexed.kore,$(EXECUTION_OUTPUTS)) -EXECUTION_STATUSES ::= $(patsubst %.rs.executed.kore,%.rs.status,$(EXECUTION_OUTPUTS)) +PREPROCESSING_INPUTS ::= $(wildcard $(PREPROCESSING_INPUT_DIR)/*.rs) +PREPROCESSING_OUTPUTS ::= $(patsubst $(PREPROCESSING_INPUT_DIR)/%.rs,$(PREPROCESSING_OUTPUT_DIR)/%.rs.preprocessed.kore,$(PREPROCESSING_INPUTS)) +PREPROCESSING_STATUSES ::= $(patsubst %.rs.preprocessed.kore,%.rs.status,$(PREPROCESSING_OUTPUTS)) .PHONY: clean build test syntax-test indexing-test @@ -25,8 +24,7 @@ test: syntax-test indexing-test syntax-test: $(SYNTAX_OUTPUTS) -indexing-test: $(INDEXING_OUTPUTS) - echo $(INDEXING_OUTPUTS) +indexing-test: $(PREPROCESSING_OUTPUTS) $(RUST_TIMESTAMP): $(SEMANTICS_FILES) $$(which kompile) rust-semantics/rust.md -o $(RUST_KOMPILED) @@ -35,8 +33,8 @@ $(SYNTAX_OUTPUT_DIR)/%.rs-parsed: $(SYNTAX_INPUT_DIR)/%.rs $(RUST_TIMESTAMP) mkdir -p $(SYNTAX_OUTPUT_DIR) kast --definition $(RUST_KOMPILED) $< --sort Crate > $@.tmp && mv -f $@.tmp $@ -$(EXECUTION_OUTPUT_DIR)/%.rs.indexed.kore: $(EXECUTION_INPUT_DIR)/%.rs $(RUST_TIMESTAMP) - mkdir -p $(EXECUTION_OUTPUT_DIR) +$(PREPROCESSING_OUTPUT_DIR)/%.rs.preprocesssed.kore: $(PREPROCESSING_INPUT_DIR)/%.rs $(RUST_TIMESTAMP) + mkdir -p $(PREPROCESSING_OUTPUT_DIR) krun \ $< \ --definition $(RUST_KOMPILED) \ diff --git a/tests/execution/empty.rs b/tests/preprocessing/empty.rs similarity index 100% rename from tests/execution/empty.rs rename to tests/preprocessing/empty.rs diff --git a/tests/execution/function-arguments.rs b/tests/preprocessing/function-arguments.rs similarity index 100% rename from tests/execution/function-arguments.rs rename to tests/preprocessing/function-arguments.rs diff --git a/tests/execution/function-return-type.rs b/tests/preprocessing/function-return-type.rs similarity index 100% rename from tests/execution/function-return-type.rs rename to tests/preprocessing/function-return-type.rs