From ea9dd716597f616c4f18e7ec7e9b3aa57bb8369e Mon Sep 17 00:00:00 2001 From: hanez Date: Sun, 28 Sep 2025 02:23:24 +0200 Subject: [PATCH] Housekepping. (0.7.3) --- .editorconfig | 36 +++++++++++-------- .gitignore | 6 ++-- CMakeLists.txt | 2 +- history/0.1.0-print.fun | 9 ----- ...fiers-simple-assignments-globals-print.fun | 18 ---------- 5 files changed, 25 insertions(+), 46 deletions(-) delete mode 100755 history/0.1.0-print.fun delete mode 100755 history/0.2.0-shebang-comments-strings-integers-booleans-identifiers-simple-assignments-globals-print.fun diff --git a/.editorconfig b/.editorconfig index 3b44659..477fe3c 100644 --- a/.editorconfig +++ b/.editorconfig @@ -13,16 +13,6 @@ ij_smart_tabs = false ij_visual_guides = none ij_wrap_on_typing = false -[*.c] -indent_style = space -indent_size = 4 -tab_width = 4 - -[*.csv] -indent_style = tab -ij_csv_keep_indents_on_empty_lines = true -ij_csv_wrap_long_lines = false - [*.properties] ij_properties_align_group_field_declarations = false ij_properties_keep_blank_lines = false @@ -37,9 +27,15 @@ ij_editorconfig_space_before_colon = false ij_editorconfig_space_before_comma = false ij_editorconfig_spaces_around_assignment_operators = true -[{*.bash,*.sh,*.zsh}] +[Makefile] +indent_style = tab indent_size = 2 -tab_width = 2 +tab_width = 1 + +[{*.bash,*.sh,*.zsh}] +indent_style = space +indent_size = 2 +tab_width = 1 ij_shell_binary_ops_start_line = false ij_shell_keep_column_alignment_padding = false ij_shell_minify_program = false @@ -47,10 +43,20 @@ ij_shell_redirect_followed_by_space = false ij_shell_switch_cases_indented = false ij_shell_use_unix_line_separator = true +[*.c] +indent_style = space +indent_size = 4 +tab_width = 1 + +[*.csv] +indent_style = tab +ij_csv_keep_indents_on_empty_lines = true +ij_csv_wrap_long_lines = false + [{*.markdown,*.md}] indent_style = space indent_size = 2 -tab_width = 2 +tab_width = 1 ij_markdown_force_one_space_after_blockquote_symbol = true ij_markdown_force_one_space_after_header_symbol = true ij_markdown_force_one_space_after_list_bullet = true @@ -70,8 +76,8 @@ ij_markdown_wrap_text_inside_blockquotes = true [{*.py,*.pyw}] indent_style = space -indent_size = 2 -tab_width = 2 +indent_size = 4 +tab_width = 1 max_line_length = 100 ij_python_align_collections_and_comprehensions = true ij_python_align_multiline_imports = true diff --git a/.gitignore b/.gitignore index 79dcd12..0f8896f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.aiignore .idea/ build* cmake* @@ -5,6 +6,5 @@ dist/ lib/*.so out/ src/*.o -tmp/ -.aiignore -dev.txt +tmp* + diff --git a/CMakeLists.txt b/CMakeLists.txt index 92b38a8..3faf4ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(fun VERSION 0.7.2 LANGUAGES C) +project(fun VERSION 0.7.3 LANGUAGES C) set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD_REQUIRED ON) diff --git a/history/0.1.0-print.fun b/history/0.1.0-print.fun deleted file mode 100755 index 729f6a0..0000000 --- a/history/0.1.0-print.fun +++ /dev/null @@ -1,9 +0,0 @@ -/* - * This file is part of the Fun programming language. - * https://hanez.org/project/fun/ - * - * Copyright 2025 Johannes Findeisen - * Licensed under the terms of the ISC license. - * https://opensource.org/license/isc-license-txt - */ - print("Have fun!") diff --git a/history/0.2.0-shebang-comments-strings-integers-booleans-identifiers-simple-assignments-globals-print.fun b/history/0.2.0-shebang-comments-strings-integers-booleans-identifiers-simple-assignments-globals-print.fun deleted file mode 100755 index 3efe7d6..0000000 --- a/history/0.2.0-shebang-comments-strings-integers-booleans-identifiers-simple-assignments-globals-print.fun +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env fun - -/* - * This file is part of the Fun programming language. - * https://hanez.org/project/fun/ - * - * Copyright 2025 Johannes Findeisen - * Licensed under the terms of the ISC license. - * https://opensource.org/license/isc-license-txt - */ - -/* - * Have, fun! - */ - -print("Have fun!") - -// Bye, no fun!