rename intrinsic to intr for consistency

JeffIrwin · Oct 27, 2024 · 5566bfc · 5566bfc
1 parent 54f6823
commit 5566bfc
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -107,7 +107,7 @@ set(LIB_SRC
 	${SRC_DIR}/parse_array.f90
 	${SRC_DIR}/parse_control.f90
 	${SRC_DIR}/parse_expr.f90
-	${SRC_DIR}/intrinsic_fns.f90
+	${SRC_DIR}/intr_fns.f90
 	${SRC_DIR}/parse_fn.f90
 	${SRC_DIR}/parse_misc.f90
 	${SRC_DIR}/parse.f90

diff --git a/src/core.f90 b/src/core.f90
@@ -11,7 +11,7 @@ module syntran__core_m
 	use syntran__consts_m
 	use syntran__errors_m
 	use syntran__eval_m
-	use syntran__intrinsic_fns_m
+	use syntran__intr_fns_m
 	use syntran__parse_m
 	use syntran__types_m
 	use syntran__utils_m

diff --git a/src/eval.f90 b/src/eval.f90
@@ -14,7 +14,7 @@ module syntran__eval_m
 	!********
 
 	type state_t
-		! Run time state
+		! Run time (eval time) state
 
 		logical :: quiet
 

diff --git a/src/intrinsic_fns.f90 → src/intr_fns.f90 b/src/intrinsic_fns.f90 → src/intr_fns.f90
@@ -1,7 +1,7 @@
 
 !===============================================================================
 
-module syntran__intrinsic_fns_m
+module syntran__intr_fns_m
 
 	use syntran__types_m
 
@@ -13,7 +13,7 @@ module syntran__intrinsic_fns_m
 
 !===============================================================================
 
-subroutine declare_intrinsic_fns(fns)
+subroutine declare_intr_fns(fns)
 
 	type(fns_t), intent(out) :: fns
 
@@ -1000,7 +1000,7 @@ subroutine declare_intrinsic_fns(fns)
 			any_fn          &
 		]
 
-end subroutine declare_intrinsic_fns
+end subroutine declare_intr_fns
 
 !===============================================================================
 
@@ -1350,7 +1350,7 @@ end subroutine resolve_overload
 
 !===============================================================================
 
-end module syntran__intrinsic_fns_m
+end module syntran__intr_fns_m
 
 !===============================================================================
 
diff --git a/src/parse_fn.f90 b/src/parse_fn.f90
@@ -3,7 +3,7 @@
 
 submodule (syntran__parse_m) syntran__parse_fn
 
-	use syntran__intrinsic_fns_m
+	use syntran__intr_fns_m
 
 	implicit none
 
@@ -101,7 +101,7 @@ recursive module function parse_fn_call(parser) result(fn_call)
 
 	end if
 
-	if (fn%is_intrinsic) fn_call%kind = fn_call_intr_expr
+	if (fn%is_intr) fn_call%kind = fn_call_intr_expr
 
 	fn_call%val = fn%type
 	if (has_rank) then
@@ -263,7 +263,7 @@ module function parse_fn_declaration(parser) result(decl)
 
 	identifier = parser%match(identifier_token)
 	fn_name_end = parser%peek_pos(0) - 1
-	fn%is_intrinsic = .false.
+	fn%is_intr = .false.
 
 	!print *, "parsing fn ", identifier%text
 

diff --git a/src/syntran.f90 b/src/syntran.f90
@@ -343,7 +343,7 @@ subroutine init_state(state)
 
 	type(state_t), intent(inout) :: state
 
-	call declare_intrinsic_fns(state%fns)
+	call declare_intr_fns(state%fns)
 
 	state%returned = .false.
 

diff --git a/src/types.f90 b/src/types.f90
@@ -48,7 +48,7 @@ module syntran__types_m
 		! the function parameters and body
 		type(syntax_node_t), allocatable :: node
 
-		logical :: is_intrinsic = .true.
+		logical :: is_intr = .true.
 
 		contains
 			procedure, pass(dst) :: copy => fn_copy
@@ -405,7 +405,7 @@ recursive subroutine fn_copy(dst, src)
 	dst%variadic_min  = src%variadic_min
 	dst%variadic_type = src%variadic_type
 	dst%param_names   = src%param_names
-	dst%is_intrinsic  = src%is_intrinsic
+	dst%is_intr       = src%is_intr
 
 	if (allocated(src%params)) then
 		if (allocated(dst%params)) deallocate(dst%params)