Successfully separated small portion of include/musique.hh

include/musique.hh

@@ -1,4 +1,5 @@
-#pragma once
+#ifndef Musique_Header_HH
+#define Musique_Header_HH
 
 #include <chrono>
 #include <concepts>
@@ -1018,61 +1019,4 @@ static constexpr bool is_callable(Value::Type type)
 	return type == Value::Type::Block || type == Value::Type::Intrinsic;
 }
 
-/// Binary operation may be vectorized when there are two argument which one is indexable and other is not
+#endif
-static inline bool may_be_vectorized(std::vector<Value> const& args)
-{
-	return args.size() == 2 && (is_indexable(args[0].type) != is_indexable(args[1].type));
-}
-
-struct Interpreter::Incoming_Midi_Callbacks
-{
-	Value note_on{};
-	Value note_off{};
-
-	inline Incoming_Midi_Callbacks() = default;
-
-	Incoming_Midi_Callbacks(Incoming_Midi_Callbacks &&) = delete;
-	Incoming_Midi_Callbacks(Incoming_Midi_Callbacks const&) = delete;
-
-	Incoming_Midi_Callbacks& operator=(Incoming_Midi_Callbacks &&) = delete;
-	Incoming_Midi_Callbacks& operator=(Incoming_Midi_Callbacks const&) = delete;
-
-
-	inline void add_callbacks(midi::Connection &midi, Interpreter &interpreter)
-	{
-		register_callback(midi.note_on_callback, note_on, interpreter);
-		register_callback(midi.note_off_callback, note_off, interpreter);
-	}
-
-	template<typename ...T>
-	inline void register_callback(std::function<void(T...)> &target, Value &callback, Interpreter &i)
-	{
-		if (&callback == &note_on || &callback == &note_off) {
-			// This messages have MIDI note number as second value, so they should be represented
-			// in our own note abstraction, not as numbers.
-			target = [interpreter = &i, callback = &callback](T ...source_args)
-			{
-				if (callback->type != Value::Type::Nil) {
-					std::vector<Value> args { Value::from(Number(source_args))... };
-					args[1] = Value::from(Chord { .notes { Note {
-						.base = i32(args[1].n.num % 12),
-						.octave = args[1].n.num / 12
-					}}});
-					auto result = (*callback)(*interpreter, std::move(args));
-					// We discard this since callback is running in another thread.
-					(void) result;
-				}
-			};
-		} else {
-			// Generic case, preserve all passed parameters as numbers
-			target = [interpreter = &i, callback = &callback](T ...source_args)
-			{
-				if (callback->type != Value::Type::Nil) {
-					auto result = (*callback)(*interpreter, { Value::from(Number(source_args))...  });
-					// We discard this since callback is running in another thread.
-					(void) result;
-				}
-			};
-		}
-	}
-};

include/musique_internal.hh

@@ -0,0 +1,63 @@
+#ifndef Musique_Internal_HH
+#define Musique_Internal_HH
+
+/// Binary operation may be vectorized when there are two argument which one is indexable and other is not
+static inline bool may_be_vectorized(std::vector<Value> const& args)
+{
+	return args.size() == 2 && (is_indexable(args[0].type) != is_indexable(args[1].type));
+}
+
+struct Interpreter::Incoming_Midi_Callbacks
+{
+	Value note_on{};
+	Value note_off{};
+
+	inline Incoming_Midi_Callbacks() = default;
+
+	Incoming_Midi_Callbacks(Incoming_Midi_Callbacks &&) = delete;
+	Incoming_Midi_Callbacks(Incoming_Midi_Callbacks const&) = delete;
+
+	Incoming_Midi_Callbacks& operator=(Incoming_Midi_Callbacks &&) = delete;
+	Incoming_Midi_Callbacks& operator=(Incoming_Midi_Callbacks const&) = delete;
+
+
+	inline void add_callbacks(midi::Connection &midi, Interpreter &interpreter)
+	{
+		register_callback(midi.note_on_callback, note_on, interpreter);
+		register_callback(midi.note_off_callback, note_off, interpreter);
+	}
+
+	template<typename ...T>
+	inline void register_callback(std::function<void(T...)> &target, Value &callback, Interpreter &i)
+	{
+		if (&callback == &note_on || &callback == &note_off) {
+			// This messages have MIDI note number as second value, so they should be represented
+			// in our own note abstraction, not as numbers.
+			target = [interpreter = &i, callback = &callback](T ...source_args)
+			{
+				if (callback->type != Value::Type::Nil) {
+					std::vector<Value> args { Value::from(Number(source_args))... };
+					args[1] = Value::from(Chord { .notes { Note {
+						.base = i32(args[1].n.num % 12),
+						.octave = args[1].n.num / 12
+					}}});
+					auto result = (*callback)(*interpreter, std::move(args));
+					// We discard this since callback is running in another thread.
+					(void) result;
+				}
+			};
+		} else {
+			// Generic case, preserve all passed parameters as numbers
+			target = [interpreter = &i, callback = &callback](T ...source_args)
+			{
+				if (callback->type != Value::Type::Nil) {
+					auto result = (*callback)(*interpreter, { Value::from(Number(source_args))...  });
+					// We discard this since callback is running in another thread.
+					(void) result;
+				}
+			};
+		}
+	}
+};
+
+#endif

src/builtin_functions.cc

@@ -1,4 +1,5 @@
 #include <musique.hh>
+#include <musique_internal.hh>
 
 #include <random>
 #include <memory>

src/builtin_operators.cc

@@ -1,4 +1,5 @@
 #include <musique.hh>
+#include <musique_internal.hh>
 
 /// Intrinsic implementation primitive to ease operation vectorization
 /// @invariant args.size() == 2

src/interpreter.cc

@@ -1,4 +1,5 @@
 #include <musique.hh>
+#include <musique_internal.hh>
 
 #include <chrono>
 #include <iostream>