[SCM] Lisaac compiler branch, mildred-projects, updated. lisaac-0.12-421-g00631ef

Mildred Ki'Lya silkensedai at online.fr
Wed Aug 5 21:05:56 UTC 2009


The following commit has been merged in the mildred-projects branch:
commit c601e7b527a8eaeb4fb88d79638a2696b62834a3
Author: Mildred Ki'Lya <silkensedai at online.fr>
Date:   Wed Aug 5 15:28:17 2009 +0200

    fix projectprotopath in PRJ_ITEM

diff --git a/src/lip/lip_project.li b/src/lip/lip_project.li
index 1da6840..d3c1cd8 100644
--- a/src/lip/lip_project.li
+++ b/src/lip/lip_project.li
@@ -41,8 +41,16 @@ Section Public
   + items :FAST_ARRAY[PRJ_ITEM];
 
   + path :STRING_CONSTANT := ALIAS_STR.path_current;
+  
   + file :STRING_CONSTANT;
 
+  + protoname :STRING_CONSTANT;
+  
+  - set_protoname n:STRING_CONSTANT <-
+  (
+    protoname := n;
+  );
+
   - name :STRING_CONSTANT <-
   (
     string_tmp.copy path;
diff --git a/src/lip/prj_item.li b/src/lip/prj_item.li
index f7c36ee..8f80da4 100644
--- a/src/lip/prj_item.li
+++ b/src/lip/prj_item.li
@@ -42,7 +42,16 @@ Section Public
 
   + project  :LIP_PROJECT;
 
-  + projectprotopath :STRING_CONSTANT <- protopath;
+  + projectprotopath :STRING_CONSTANT <-
+  (
+    string_tmp.clear;
+    (project.protoname != NULL).if {
+      string_tmp.append (project.protoname);
+      string_tmp.add_last '.';
+    };
+    string_tmp.append protopath;
+    ALIAS_STR.get string_tmp
+  );
 
   + protopath:STRING_CONSTANT;
 

-- 
Lisaac compiler



More information about the Lisaac-commits mailing list