fix problem of content attr

SalamLang · Dec 28, 2024 · 11904d1 · 11904d1
1 parent 0b57c6c
commit 11904d1
Show file tree

Hide file tree

Showing 21 changed files with 81 additions and 14 deletions.
diff --git a/config/docs.md b/config/docs.md
@@ -38,7 +38,7 @@
 
 <h2 id="div">دستور <code>جعبه</code></h2>
 
-این دستور فرزند است.
+این دستور مادر است و می تواند حامی دستوراتی به عنوان فرزند باشد.
 
 نام این دستور معادل دستور `div` می‌باشد.
 

diff --git a/config/json/layout/type.json b/config/json/layout/type.json
@@ -67,16 +67,16 @@
             "examples": "",
             "generate_name": "div",
             "id": "AST_LAYOUT_TYPE_DIV",
-            "is_mother": false,
+            "attributes": null,
+            "is_mother": true,
             "text": {
                 "en": [
                     "box"
                 ],
                 "fa": [
                     "جعبه"
                 ]
-            },
-            "attributes": null
+            }
         },
         {
             "descriptions": "",

diff --git a/config/layout/type.yaml b/config/layout/type.yaml
@@ -48,7 +48,8 @@ items:
     examples: ''
     generate_name: div
     id: AST_LAYOUT_TYPE_DIV
-    is_mother: false
+    attributes:
+    is_mother: true
     text:
       en:
         - box

diff --git a/example/input.salam b/example/input.salam
@@ -1,11 +1,14 @@
 صفحه:
 	زبان = «فارسی»
 
+
+
 	جهت = «راست به چپ»
 //	جهت = «چپ به راست»
 
 	رنگ پس زمینه = «سبز»
 
+
 	جعبه:
 		رنگ پس زمینه = «قرمز»
 		رنگ = «سفید»
@@ -14,19 +17,15 @@
 		گردی = ۹
 	تمام
 
-	///*
-	بارگیری:
-		تکرار = ۳۰
-		فضا بالا = ۲۰
-		منبع = «example/card.salam»
-	تمام
-	//*/
-
+	/*
 	جعبه:
 		رنگ پس زمینه = «بنفش»
 		رنگ = «سفید»
 		محتوا = «سلام چطوری؟»
 		گردی = ۹
 		فضا بالا = ۹
 	تمام
+
+	*/
+
 تمام
diff --git a/src/ast_layout.c b/src/ast_layout.c
@@ -613,6 +613,32 @@ ast_layout_attribute_type_t name_to_ast_layout_attribute_type(char *name) {
     return type;
 }
 
+// TODO
+bool ast_layout_node_type_is_mother(ast_layout_node_type_t type) {
+    switch (type) {
+#undef ADD_LAYOUT_TYPE
+#undef ADD_LAYOUT_TYPE_HIDE
+#undef ADD_LAYOUT_TYPE_REPEAT
+
+#define ADD_LAYOUT_TYPE(TYPE, NAME, NAME_LOWER, GENERATED_NAME, ENDUSER_NAME, \
+                        IS_MOTHER)                                            \
+    case TYPE:                                                                \
+        return IS_MOTHER;
+
+#define ADD_LAYOUT_TYPE_HIDE(TYPE, NAME, NAME_LOWER, GENERATED_NAME, \
+                             ENDUSER_NAME, IS_MOTHER)                \
+    case TYPE:                                                       \
+        return IS_MOTHER;
+
+#define ADD_LAYOUT_TYPE_REPEAT(TYPE, NAME, NAME_LOWER, GENERATED_NAME, \
+                               ENDUSER_NAME, IS_MOTHER)
+
+#include "generated-config/ast_layout_type.h"
+    }
+
+    return false;
+}
+
 ast_layout_attribute_type_t ast_layout_attribute_enduser_name_in_node_to_type(char *name, ast_layout_node_type_t parent_node_type)
 {
     for (int i = 0; i < map_size; i++) {
@@ -628,6 +654,14 @@ ast_layout_attribute_type_t ast_layout_attribute_enduser_name_in_node_to_type(ch
         }
     }
 
+    if (ast_layout_node_type_is_mother(parent_node_type)) {
+        char *enduser_name = ast_layout_attribute_type_to_enduser_name(AST_LAYOUT_ATTRIBUTE_TYPE_CONTENT);
+
+        if (strcmp(name, enduser_name) == 0) {
+            return AST_LAYOUT_ATTRIBUTE_TYPE_CONTENT;
+        }
+    }
+
     return AST_LAYOUT_ATTRIBUTE_TYPE_ERROR;
 }
 

diff --git a/src/ast_layout.h b/src/ast_layout.h
@@ -431,4 +431,7 @@ bool ast_layout_attribute_has_any_sub_value(ast_layout_attribute_t *value);
 char *ast_layout_attribute_type_to_enduser_name(
     ast_layout_attribute_type_t type);
 
+// TODO
+bool ast_layout_node_type_is_mother(ast_layout_node_type_t type);
+
 #endif
diff --git a/src/generated-config/ast_block_type.h b/src/generated-config/ast_block_type.h
@@ -28,5 +28,7 @@ ADD_BLOCK_TYPE(AST_BLOCK_TYPE_ERROR, "ERROR", "error")
 
 
 
+
+
 
 
diff --git a/src/generated-config/ast_layout_attribute_style_global.h b/src/generated-config/ast_layout_attribute_style_global.h
@@ -28,3 +28,5 @@ ADD_LAYOUT_ATTRIBUTE_STYLE_GLOBAL_VALUE(unset, "حذف شده")
 
 
 
+
+
diff --git a/src/generated-config/ast_layout_attribute_style_state_type.h b/src/generated-config/ast_layout_attribute_style_state_type.h
@@ -88,3 +88,5 @@ ADD_LAYOUT_ATTRIBUTE_STYLE_STATE_TYPE(AST_LAYOUT_ATTRIBUTE_STYLE_STATE_TYPE_EMPT
 
 
 
+
+
diff --git a/src/generated-config/ast_layout_attribute_style_type.h b/src/generated-config/ast_layout_attribute_style_type.h
@@ -587,3 +587,5 @@ ADD_LAYOUT_ATTRIBUTE_STYLE_TYPE_HIDE(AST_LAYOUT_ATTRIBUTE_STYLE_TYPE_ERROR, "ERR
 
 
 
+
+
diff --git a/src/generated-config/ast_layout_attribute_style_value.h b/src/generated-config/ast_layout_attribute_style_value.h
@@ -1491,3 +1491,5 @@ const ast_layout_attribute_pair_t ast_layout_allowed_style_list_zoom[] = {
 
 
 
+
+
diff --git a/src/generated-config/ast_layout_attribute_style_value_extern.h b/src/generated-config/ast_layout_attribute_style_value_extern.h
@@ -378,3 +378,5 @@ extern const ast_layout_attribute_pair_t ast_layout_allowed_style_list_zoom[];
 
 
 
+
+
diff --git a/src/generated-config/ast_layout_attribute_type.h b/src/generated-config/ast_layout_attribute_type.h
@@ -88,3 +88,5 @@ ADD_LAYOUT_ATTRIBUTE_TYPE(AST_LAYOUT_ATTRIBUTE_TYPE_RESPONSIVE_MIN_HEIGHT, "RESP
 
 
 
+
+
diff --git a/src/generated-config/ast_layout_attribute_value.h b/src/generated-config/ast_layout_attribute_value.h
@@ -58,3 +58,5 @@ const ast_layout_attribute_pair_t ast_layout_allowed_lang[] = {
 
 
 
+
+
diff --git a/src/generated-config/ast_layout_attribute_value_extern.h b/src/generated-config/ast_layout_attribute_value_extern.h
@@ -33,3 +33,5 @@ extern const ast_layout_attribute_pair_t ast_layout_allowed_lang[];
 
 
 
+
+
diff --git a/src/generated-config/ast_layout_type.h b/src/generated-config/ast_layout_type.h
@@ -8,7 +8,7 @@ ADD_LAYOUT_TYPE(AST_LAYOUT_TYPE_ERROR, "ERROR", "error", "", "خطا", false)
 
 ADD_LAYOUT_TYPE(AST_LAYOUT_TYPE_LAYOUT, "LAYOUT", "layout", "", "صفحه", false)
 
-ADD_LAYOUT_TYPE(AST_LAYOUT_TYPE_DIV, "DIV", "div", "div", "جعبه", false)
+ADD_LAYOUT_TYPE(AST_LAYOUT_TYPE_DIV, "DIV", "div", "div", "جعبه", true)
 
 ADD_LAYOUT_TYPE(AST_LAYOUT_TYPE_PARAGRAPH, "PARAGRAPH", "paragraph", "p", "پاراگراف", false)
 
@@ -145,5 +145,7 @@ ADD_LAYOUT_TYPE_REPEAT(AST_LAYOUT_TYPE_MEDIA, "MEDIA", "media", "@media", "وا
 
 
 
+
+
 
 
diff --git a/src/generated-config/ast_layout_type_attributes.h b/src/generated-config/ast_layout_type_attributes.h
@@ -155,5 +155,7 @@ else if (attribute->parent_node_type == AST_LAYOUT_TYPE_MEDIA) {
 
 
 
+
+
 
 
diff --git a/src/generated-config/ast_layout_type_attributes_all.h b/src/generated-config/ast_layout_type_attributes_all.h
@@ -120,3 +120,5 @@ const size_t map_size = sizeof(layout_map) / sizeof(layout_map[0]);
 
 #endif
 
+
+
diff --git a/src/generated-config/ast_layout_type_attributes_values.h b/src/generated-config/ast_layout_type_attributes_values.h
@@ -210,3 +210,5 @@ const size_t valid_attributes_media_length = 0;
 #endif
 
 
+
+
diff --git a/src/generated-config/ast_layout_type_attributes_values_extern.h b/src/generated-config/ast_layout_type_attributes_values_extern.h
@@ -170,3 +170,5 @@ extern const size_t valid_attributes_media_length;
 // ----------- END AUTO GENERATED ----------- //
 
 #endif
+
+
diff --git a/src/generated-config/ast_type.h b/src/generated-config/ast_type.h
@@ -36,5 +36,7 @@ ADD_TYPE(AST_TYPE_ERROR, "ERROR", "error")
 
 
 
+
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,5 +28,7 @@ ADD_BLOCK_TYPE(AST_BLOCK_TYPE_ERROR, "ERROR", "error")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,3 +28,5 @@ ADD_LAYOUT_ATTRIBUTE_STYLE_GLOBAL_VALUE(unset, "حذف شده")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -88,3 +88,5 @@ ADD_LAYOUT_ATTRIBUTE_STYLE_STATE_TYPE(AST_LAYOUT_ATTRIBUTE_STYLE_STATE_TYPE_EMPT
Original file line number	Diff line number	Diff line change
Expand Up		@@ -587,3 +587,5 @@ ADD_LAYOUT_ATTRIBUTE_STYLE_TYPE_HIDE(AST_LAYOUT_ATTRIBUTE_STYLE_TYPE_ERROR, "ERR
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1491,3 +1491,5 @@ const ast_layout_attribute_pair_t ast_layout_allowed_style_list_zoom[] = {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -378,3 +378,5 @@ extern const ast_layout_attribute_pair_t ast_layout_allowed_style_list_zoom[];
Original file line number	Diff line number	Diff line change
Expand Up		@@ -88,3 +88,5 @@ ADD_LAYOUT_ATTRIBUTE_TYPE(AST_LAYOUT_ATTRIBUTE_TYPE_RESPONSIVE_MIN_HEIGHT, "RESP
Original file line number	Diff line number	Diff line change
Expand Up		@@ -58,3 +58,5 @@ const ast_layout_attribute_pair_t ast_layout_allowed_lang[] = {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,3 +33,5 @@ extern const ast_layout_attribute_pair_t ast_layout_allowed_lang[];
Original file line number	Diff line number	Diff line change
Expand Up		@@ -155,5 +155,7 @@ else if (attribute->parent_node_type == AST_LAYOUT_TYPE_MEDIA) {