From 0c47aec77d27e822aca14ed0cebb58ac96e46902 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Mon, 10 Aug 2026 11:30:12 +0200 Subject: [PATCH] csys:program: move program.lisp to program/basic.lisp --- csys/{program.lisp => program/basic.lisp} | 6 +++--- scopes-csys.asd | 3 +-- scratch.lisp | 4 ++-- test/test-csys.lisp | 5 +++-- 4 files changed, 9 insertions(+), 9 deletions(-) rename csys/{program.lisp => program/basic.lisp} (92%) diff --git a/csys/program.lisp b/csys/program/basic.lisp similarity index 92% rename from csys/program.lisp rename to csys/program/basic.lisp index 4a327aa..9e89481 100644 --- a/csys/program.lisp +++ b/csys/program/basic.lisp @@ -1,6 +1,6 @@ -;;;; cl-scopes/csys/program - common and general csys program definitions +;;;; cl-scopes/csys/program/basic - common and general csys program definitions -(defpackage :scopes/csys/program +(defpackage :scopes/csys/program/basic (:use :common-lisp) (:local-nicknames (:actor :scopes/core/actor) (:csys :scopes/csys) @@ -8,7 +8,7 @@ (:util :scopes/util)) (:export #:basic-0 #:config-basic-1)) -(in-package :scopes/csys/program) +(in-package :scopes/csys/program/basic) ;;;; basic-0: minimal recursive system diff --git a/scopes-csys.asd b/scopes-csys.asd index 38cc72d..893df01 100644 --- a/scopes-csys.asd +++ b/scopes-csys.asd @@ -11,8 +11,7 @@ :depends-on (:scopes-core) :components ((:file "csys/csys") (:file "csys/environ" :depends-on ("csys/csys")) - (:file "csys/program" :depends-on ("csys/csys" "csys/environ")) - ) + (:file "csys/program/basic" :depends-on ("csys/csys" "csys/environ"))) :long-description "scopes/csys: Concurrent cybernetic communication systems." :in-order-to ((test-op (test-op "scopes-csys/test")))) diff --git a/scratch.lisp b/scratch.lisp index a53a59c..3a96078 100644 --- a/scratch.lisp +++ b/scratch.lisp @@ -8,11 +8,11 @@ ;;;; csys stuff +(add-package-local-nickname :basic :scopes/csys/program/basic) (add-package-local-nickname :environ :scopes/csys/environ) -(add-package-local-nickname :program :scopes/csys/program) (scopes/util/async:init) -(setf environ:*env* (environ:simple-setup (program:config-basic-1))) +(setf environ:*env* (environ:simple-setup (basic:config-basic-1))) ;(environ:send-value '(:s00 "0-1") 2) diff --git a/test/test-csys.lisp b/test/test-csys.lisp index 5a9e069..806d38b 100644 --- a/test/test-csys.lisp +++ b/test/test-csys.lisp @@ -5,6 +5,7 @@ (:local-nicknames (:alx :alexandria) (:actor :scopes/core/actor) (:async :scopes/util/async) + (:basic :scopes/csys/program/basic) (:config :scopes/config) (:core :scopes/core) (:csys :scopes/csys) @@ -67,7 +68,7 @@ ;;;; test definitions (deftest test-basic-0 () - (let ((environ:*env* (setup-test (list (program:basic-0))))) + (let ((environ:*env* (setup-test (list (basic:basic-0))))) ;(rcvr (tc:receiver t:*test-suite*)) (sleep 0.1) ;(tc:expect rcvr (message:create '(:csys :effect :e01) :data '(:value 1))) @@ -77,7 +78,7 @@ (core:shutdown))) (deftest test-basic-1 () - (let ((environ:*env* (setup-test (program:config-basic-1)))) + (let ((environ:*env* (setup-test (basic:config-basic-1)))) (sleep 0.1) (environ:send-value '(:s01 "0-0") 1) (environ:send-value '(:s01 "0-1") 2)