cshape 0.2.1__tar.gz → 0.2.3__tar.gz

{cshape-0.2.1 → cshape-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cshape
-Version: 0.2.1
+Version: 0.2.3
 Summary: A dependency-free C AST + printer: build a tree in Python, get C11 source back
 Author-email: Alex Balan <outsiders.b@gmail.com>
 License-Expression: MIT
@@ -62,6 +62,12 @@ int add(int a, int b) {
 starts with a blank line by default, so `.strip()` if you're printing a
 single node standalone rather than concatenating several.)
 
+## Documentation
+
+- [docs/api.md](docs/api.md) - documentation index
+- [docs/quickstart.md](docs/quickstart.md) - getting started and first example
+- [docs/reference.md](docs/reference.md) - current API reference
+
 ## What it covers
 
 - Types: named types, pointers, arrays, function types, structs/unions, enums
@@ -77,6 +83,9 @@ single node standalone rather than concatenating several.)
 - A `.mark` field on every node: set it to any string and it shows up as a
   `/*mark*/` comment right before that node in the output — useful for
   tracing which part of your own compiler/generator produced which bit of C
+- A `.note` field on every value, printed as a `/* note */` comment *after*
+  the value — for saying where a value came from once it no longer shows:
+  `3.125 /* totalVolume / elementVolume */`
 
 ## What it doesn't do
 

{cshape-0.2.1 → cshape-0.2.3}/README.md

@@ -44,6 +44,12 @@ int add(int a, int b) {
 starts with a blank line by default, so `.strip()` if you're printing a
 single node standalone rather than concatenating several.)
 
+## Documentation
+
+- [docs/api.md](docs/api.md) - documentation index
+- [docs/quickstart.md](docs/quickstart.md) - getting started and first example
+- [docs/reference.md](docs/reference.md) - current API reference
+
 ## What it covers
 
 - Types: named types, pointers, arrays, function types, structs/unions, enums
@@ -59,6 +65,9 @@ single node standalone rather than concatenating several.)
 - A `.mark` field on every node: set it to any string and it shows up as a
   `/*mark*/` comment right before that node in the output — useful for
   tracing which part of your own compiler/generator produced which bit of C
+- A `.note` field on every value, printed as a `/* note */` comment *after*
+  the value — for saying where a value came from once it no longer shows:
+  `3.125 /* totalVolume / elementVolume */`
 
 ## What it doesn't do
 

{cshape-0.2.1 → cshape-0.2.3}/cshape.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cshape
-Version: 0.2.1
+Version: 0.2.3
 Summary: A dependency-free C AST + printer: build a tree in Python, get C11 source back
 Author-email: Alex Balan <outsiders.b@gmail.com>
 License-Expression: MIT
@@ -62,6 +62,12 @@ int add(int a, int b) {
 starts with a blank line by default, so `.strip()` if you're printing a
 single node standalone rather than concatenating several.)
 
+## Documentation
+
+- [docs/api.md](docs/api.md) - documentation index
+- [docs/quickstart.md](docs/quickstart.md) - getting started and first example
+- [docs/reference.md](docs/reference.md) - current API reference
+
 ## What it covers
 
 - Types: named types, pointers, arrays, function types, structs/unions, enums
@@ -77,6 +83,9 @@ single node standalone rather than concatenating several.)
 - A `.mark` field on every node: set it to any string and it shows up as a
   `/*mark*/` comment right before that node in the output — useful for
   tracing which part of your own compiler/generator produced which bit of C
+- A `.note` field on every value, printed as a `/* note */` comment *after*
+  the value — for saying where a value came from once it no longer shows:
+  `3.125 /* totalVolume / elementVolume */`
 
 ## What it doesn't do
 

{cshape-0.2.1 → cshape-0.2.3}/cshape.py

@@ -55,13 +55,12 @@ def str_nl_indent(nl=1):
 	return s
 
 
-def render(node, style='legacy', indent='\t', newline='\n'):
+def render(node, style='legacy', indent='\t'):
 	global indent_level, styleguide, nl_symbol, indent_symbol
 
 	saved = (indent_level, styleguide, nl_symbol, indent_symbol)
 	indent_level = 0
 	styleguide = styles[style]
-	nl_symbol = newline
 	indent_symbol = indent
 
 	try:
@@ -141,11 +140,6 @@ def str_gcc_attributes(attributes):
 
 
 
-
-
-
-
-
 class CField():
 	def __init__(self, id, type, specifiers=None, nl=0):
 		#assert(isinstance(type, CType))
@@ -253,11 +247,12 @@ class CTypeFunction(CType):
 
 
 class CTypeStruct(CType):
-	def __init__(self, fields, tag, specifiers=None):
+	def __init__(self, fields, tag, specifiers=None, attributes=None):
 		super().__init__()
 		self.fields = fields
 		self.tag = tag
 		self.specifiers = specifiers if specifiers != None else []
+		self.attributes = attributes
 		self.precedence = 0
 
 	def to_str(self, text='', with_qualifiers=True):
@@ -288,7 +283,13 @@ class CTypeStruct(CType):
 		else:
 			sstr += 'uint8_t __placeholder;'
 		indent_down()
-		sstr += str_nl_indent(nl_end) + '}' + with_space(text)
+		sstr += str_nl_indent(nl_end) + '}'
+		# атрибуты типа печатаем после закрывающей скобки, а не перед
+		# декларацией: в префиксной позиции компилятор их у struct/union
+		# игнорирует ("attribute is ignored, place it after struct"),
+		# а эта работает всюду - и в определении, и в typedef, и у поля
+		sstr += with_space(str_gcc_attributes(self.attributes).strip())
+		sstr += with_space(text)
 		return sstr
 
 
@@ -392,16 +393,25 @@ class KV():
 		self.key = key
 		self.value = value
 		self.nl = nl
+		self.mark = None
+
+
+def str_kv(x):
+	sstr = ".%s = %s" % (x.key, str_cvalue(x.value))
+	if x.mark != None:
+		sstr = '/*%s*/' % x.mark + sstr
+	return sstr
 
 
 class CValue():
-	def __init__(self):
+	def __init__(self, nl=0):
 		self.mark = None
+		self.nl = nl
 
 
 class CValueIdentifier(CValue):
-	def __init__(self, id):
-		super().__init__()
+	def __init__(self, id, nl=0):
+		super().__init__(nl=nl)
 		self.id = id
 		self.precedence = 15
 
@@ -412,8 +422,8 @@ class CValueIdentifier(CValue):
 
 
 class CValueInteger(CValue):
-	def __init__(self, number, as_hex=False, nsigns=0, suffix=''):
-		super().__init__()
+	def __init__(self, number, as_hex=False, nsigns=0, suffix='', nl=0):
+		super().__init__(nl=nl)
 		assert(isinstance(number, int))
 		assert(isinstance(as_hex, bool))
 		self.precedence = 15
@@ -441,9 +451,9 @@ def string_literal_prefix(width):
 
 
 class CValueString(CValue):
-	def __init__(self, string, width):
+	def __init__(self, string, width, nl=0):
 		assert(isinstance(string, str))
-		super().__init__()
+		super().__init__(nl=nl)
 		self.string = string
 		self.width = width
 		self.precedence = 15
@@ -475,9 +485,9 @@ def code_to_char(cc):
 
 
 class CValueChar(CValue):
-	def __init__(self, cc, width=8):
+	def __init__(self, cc, width=8, nl=0):
 		assert(isinstance(cc, int))
-		super().__init__()
+		super().__init__(nl=nl)
 		self.char_code = cc
 		self.width = width
 		self.precedence = 15
@@ -488,8 +498,8 @@ class CValueChar(CValue):
 
 
 class CValueArray(CValue):
-	def __init__(self, items):
-		super().__init__()
+	def __init__(self, items, nl=0):
+		super().__init__(nl=nl)
 		self.items = items
 		self.precedence = 15
 
@@ -520,8 +530,8 @@ class CValueArray(CValue):
 
 
 class CValueStruct(CValue):
-	def __init__(self, items):
-		super().__init__()
+	def __init__(self, items, nl=0):
+		super().__init__(nl=nl)
 		self.items = items
 		self.precedence = 15
 
@@ -540,7 +550,7 @@ class CValueStruct(CValue):
 				if item.nl == 0:
 					s_items += " "
 			s_items += str_nl_indent(item.nl)
-			s_items += ".%s = %s" % (item.key, str_cvalue(item.value))
+			s_items += str_kv(item)
 			i += 1
 
 		indent_down()
@@ -561,14 +571,14 @@ class CValueStruct(CValue):
 
 
 class CValueParen(CValue):
-	def __init__(self, value):
+	def __init__(self, value, nl=0):
 		assert(isinstance(value, CValue))
-		super().__init__()
+		super().__init__(nl=nl)
 		self.value = value
 		self.precedence = 15
 
 	def __str__(self):
-		return '(%s)' % str_cvalue(self.value, ext_precedence=self.precedence)
+		return str_cvalue(self.value, ext_precedence=valuePrecedenceMax)
 
 
 
@@ -661,28 +671,6 @@ class CValueDereference(CValue):
 		return '*%s' % str_cvalue(self.value, ext_precedence=self.precedence)
 
 
-class CValueIncrement(CValue):
-	def __init__(self, value):
-		assert(isinstance(value, CValue))
-		super().__init__()
-		self.value = value
-		self.precedence = 13
-
-	def __str__(self):
-		return '++%s' % (str_cvalue(self.value, ext_precedence=self.precedence))
-
-
-class CValueDecrement(CValue):
-	def __init__(self, value):
-		assert(isinstance(value, CValue))
-		super().__init__()
-		self.value = value
-		self.precedence = 13
-
-	def __str__(self):
-		return '--%s' % str_cvalue(self.value, ext_precedence=self.precedence)
-
-
 class CValueUnaryPlus(CValue):
 	def __init__(self, value):
 		assert(isinstance(value, CValue))
@@ -760,7 +748,7 @@ class CValueMul(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s * %s' % (lx, rx)
 
 
@@ -775,7 +763,7 @@ class CValueDiv(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s / %s' % (lx, rx)
 
 
@@ -790,7 +778,7 @@ class CValueMod(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s %% %s' % (lx, rx)
 
 
@@ -805,7 +793,7 @@ class CValueAdd(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s + %s' % (lx, rx)
 
 
@@ -820,7 +808,7 @@ class CValueSub(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s - %s' % (lx, rx)
 
 
@@ -839,7 +827,7 @@ class CValueShiftLeft(CValue):
 		lprec = self.precedence
 		if self.left.precedence == self.precedence + 1:
 			lprec = valuePrecedenceMax
-		rprec = self.precedence
+		rprec = self.precedence + 1
 		if self.right.precedence == self.precedence + 1:
 			rprec = valuePrecedenceMax
 
@@ -863,7 +851,7 @@ class CValueShiftRight(CValue):
 		lprec = self.precedence
 		if self.left.precedence == self.precedence + 1:
 			lprec = valuePrecedenceMax
-		rprec = self.precedence
+		rprec = self.precedence + 1
 		if self.right.precedence == self.precedence + 1:
 			rprec = valuePrecedenceMax
 
@@ -883,7 +871,7 @@ class CValueLt(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s < %s' % (lx, rx)
 
 
@@ -898,7 +886,7 @@ class CValueGt(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s > %s' % (lx, rx)
 
 
@@ -913,7 +901,7 @@ class CValueLE(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s <= %s' % (lx, rx)
 
 
@@ -928,7 +916,7 @@ class CValueGE(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s >= %s' % (lx, rx)
 
 
@@ -943,7 +931,7 @@ class CValueEq(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s == %s' % (lx, rx)
 
 
@@ -958,7 +946,7 @@ class CValueNe(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s != %s' % (lx, rx)
 
 
@@ -982,7 +970,7 @@ class CValueBitwiseAnd(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s & %s' % (lx, rx)
 
 
@@ -997,7 +985,7 @@ class CValueBitwiseXor(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=select_prio_plus(self.precedence, self.left.precedence, n=1))
-		rx = str_cvalue(self.right, ext_precedence=select_prio_plus(self.precedence, self.right.precedence, n=1))
+		rx = str_cvalue(self.right, ext_precedence=max(self.precedence + 1, select_prio_plus(self.precedence, self.right.precedence, n=1)))
 		return '%s ^ %s' % (lx, rx)
 
 
@@ -1012,7 +1000,7 @@ class CValueBitwiseOr(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=select_prio_plus(self.precedence, self.left.precedence, n=2))
-		rx = str_cvalue(self.right, ext_precedence=select_prio_plus(self.precedence, self.right.precedence, n=2))
+		rx = str_cvalue(self.right, ext_precedence=max(self.precedence + 1, select_prio_plus(self.precedence, self.right.precedence, n=2)))
 		return '%s | %s' % (lx, rx)
 
 
@@ -1027,7 +1015,7 @@ class CValueLogicalAnd(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return '%s && %s' % (lx, rx)
 
 
@@ -1042,7 +1030,7 @@ class CValueLogicalOr(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=select_prio_plus(self.precedence, self.left.precedence, n=1))
-		rx = str_cvalue(self.right, ext_precedence=select_prio_plus(self.precedence, self.right.precedence, n=1))
+		rx = str_cvalue(self.right, ext_precedence=max(self.precedence + 1, select_prio_plus(self.precedence, self.right.precedence, n=1)))
 		return '%s || %s' % (lx, rx)
 
 
@@ -1109,7 +1097,7 @@ class CValueStringConcat(CValue):
 
 	def __str__(self):
 		lx = str_cvalue(self.left, ext_precedence=self.precedence)
-		rx = str_cvalue(self.right, ext_precedence=self.precedence)
+		rx = str_cvalue(self.right, ext_precedence=self.precedence + 1)
 		return lx + ' ' + rx
 
 
@@ -1117,7 +1105,10 @@ class CValueStringConcat(CValue):
 def str_cvalue(v, ext_precedence=0):
 	assert(isinstance(v, CValue))
 	y = str(v)
-	sstr = wrap_if(y, (v.precedence < ext_precedence) or v.mark and (v.precedence < valuePrecedenceMax))
+	# (!) mark сам по себе скобок не ставит. Комментарий в C лексически
+	# прозрачен, а скобки - нет: отладочная пометка, меняющая
+	# сгенерированный код, перестает быть наблюдением за ним
+	sstr = wrap_if(y, v.precedence < ext_precedence)
 	if v.mark != None:
 		sstr = '/*%s*/' % v.mark + sstr
 	return sstr
@@ -1128,15 +1119,13 @@ def str_cvalue(v, ext_precedence=0):
 
 def str_cstmt(x):
 	assert(x != None)
-	sstr = ''
-	#if x.comment != None:
-	#	sstr += str_nl_indent(x.comment.nl)
-	#	print_comment(x.comment)
-	#sstr += str_nl_indent(x.nl)
-	sstr += str(x)
+	# (!) перевод строки и отступ печатает обертка, а не сам узел: пометка
+	# относится к коду, а не к пустому месту перед ним, и должна встать
+	# между отступом и кодом - иначе она уезжает в конец предыдущей строки
+	sstr = str_nl_indent(x.nl)
 	if x.mark != None:
-		sstr = '/*%s*/' % x.mark + sstr
-	return sstr
+		sstr += '/*%s*/' % x.mark
+	return sstr + str(x)
 
 
 class CStmt():
@@ -1156,7 +1145,6 @@ class CStmtLineComment(CStmt):
 
 	def __str__(self):
 		sstr = ''
-		sstr += str_nl_indent(self.nl)
 		n = len(self.lines)
 		i = 0
 		while i < n:
@@ -1176,8 +1164,7 @@ class CStmtBlockComment(CStmt):
 		self.nl = 1
 
 	def __str__(self):
-		sstr = str_nl_indent(self.nl)
-		sstr += "/*%s*/" % self.text
+		sstr = "/*%s*/" % self.text
 		return sstr
 
 
@@ -1209,8 +1196,7 @@ class CStmtExpr(CStmt):
 		self.nl = 1
 
 	def __str__(self):
-		sstr = str_nl_indent(self.nl)
-		return sstr + str_cvalue(self.value) + ';'
+		return str_cvalue(self.value) + ';'
 
 
 class CStmtAssignment(CStmt):
@@ -1222,8 +1208,7 @@ class CStmtAssignment(CStmt):
 		self.rvalue = rvalue
 
 	def __str__(self):
-		sstr = str_nl_indent(self.nl)
-		return sstr + "%s = %s;" % (str_cvalue(self.lvalue), str_cvalue(self.rvalue))
+		return "%s = %s;" % (str_cvalue(self.lvalue), str_cvalue(self.rvalue))
 
 
 class CStmtIncrement(CStmt):
@@ -1233,7 +1218,7 @@ class CStmtIncrement(CStmt):
 		self.value = value
 
 	def __str__(self):
-		return str_nl_indent(self.nl) + "++%s;" % str_cvalue(self.value)
+		return "++%s;" % str_cvalue(self.value)
 
 
 class CStmtDecrement(CStmt):
@@ -1243,7 +1228,7 @@ class CStmtDecrement(CStmt):
 		self.value = value
 
 	def __str__(self):
-		return str_nl_indent(self.nl) + "--%s;" % str_cvalue(self.value)
+		return "--%s;" % str_cvalue(self.value)
 
 
 class CStmtDeclType(CStmt):
@@ -1254,8 +1239,7 @@ class CStmtDeclType(CStmt):
 		self.attributes = attributes
 
 	def __str__(self):
-		sstr = str_nl_indent(self.nl)
-		sstr += str_gcc_attributes(self.attributes)
+		sstr = str_gcc_attributes(self.attributes)
 		sstr += str_ctype(self.type) + ';'
 		return sstr
 
@@ -1270,8 +1254,7 @@ class CStmtDefType(CStmt):
 		self.attributes = attributes
 
 	def __str__(self):
-		sstr = str_nl_indent(self.nl)
-		sstr += str_gcc_attributes(self.attributes)
+		sstr = str_gcc_attributes(self.attributes)
 		sstr += 'typedef %s;' % self.type.to_str(text=self.id)
 		return sstr
 
@@ -1291,11 +1274,10 @@ class CStmtDefVar(CStmt):
 		self.attributes = attributes
 
 	def __str__(self):
-		sstr = str_nl_indent(self.nl)
-		sstr += str_gcc_attributes(self.attributes)
+		sstr = str_gcc_attributes(self.attributes)
 		if self.storage not in (None, ''):
 			sstr += self.storage + ' '
-		#mass
+
 		sstr += str_ctype(self.type, text=self.id)
 		if self.initializer != None:
 			sstr += ' = %s' % str_cvalue(self.initializer)
@@ -1319,8 +1301,7 @@ class CStmtDefFunc(CStmt):
 		self.nl = 2
 
 	def __str__(self):
-		sstr = str_nl_indent(self.nl)
-		sstr += str_gcc_attributes(self.attributes)
+		sstr = str_gcc_attributes(self.attributes)
 		if self.storage not in (None, ''):
 			sstr += self.storage + ' '
 		sstr += self.type.to_str(text=self.id)
@@ -1347,13 +1328,12 @@ class CStmtIf(CStmt):
 		self.else_block = else_block
 
 	def __str__(self):
-		sstr = str_nl_indent(self.nl)
-		sstr += "if (%s)" % str_cvalue(self.condition)
+		sstr = "if (%s)" % str_cvalue(self.condition)
 		if styleguide['LINE_BREAK_BEFORE_BLOCK_BRACE']:
 			sstr += str_nl_indent()
 		else:
 			sstr += ' '
-		sstr += str(self.then_block)
+		sstr += str_cstmt(self.then_block)
 		if self.else_block != None:
 			if styleguide['LINE_BREAK_BEFORE_BLOCK_BRACE']:
 				sstr += str_nl_indent()
@@ -1364,7 +1344,7 @@ class CStmtIf(CStmt):
 				sstr += str_nl_indent()
 			else:
 				sstr += ' '
-			sstr += str(self.else_block)
+			sstr += str_cstmt(self.else_block)
 		return sstr
 
 
@@ -1377,13 +1357,12 @@ class CStmtWhile(CStmt):
 		self.block = block
 
 	def __str__(self):
-		sstr = str_nl_indent(self.nl)
-		sstr += "while (%s)" % str_cvalue(self.condition)
+		sstr = "while (%s)" % str_cvalue(self.condition)
 		if styleguide['LINE_BREAK_BEFORE_BLOCK_BRACE']:
 			sstr += str_nl_indent()
 		else:
 			sstr += ' '
-		sstr += str(self.block)
+		sstr += str_cstmt(self.block)
 		return sstr
 
 
@@ -1395,8 +1374,7 @@ class CStmtReturn(CStmt):
 		self.return_value = return_value
 
 	def __str__(self):
-		sstr = str_nl_indent(self.nl)
-		sstr += 'return'
+		sstr = 'return'
 		if self.return_value != None:
 			sstr += ' ' + str_cvalue(self.return_value)
 		return sstr + ";"
@@ -1408,8 +1386,7 @@ class CStmtBreak(CStmt):
 		pass
 
 	def __str__(self):
-		sstr = str_nl_indent(self.nl)
-		sstr += "break;"
+		sstr = "break;"
 		return sstr
 
 
@@ -1419,8 +1396,7 @@ class CStmtContinue(CStmt):
 		pass
 
 	def __str__(self):
-		sstr = str_nl_indent(self.nl)
-		sstr += "continue;"
+		sstr = "continue;"
 		return sstr
 
 
@@ -1442,8 +1418,7 @@ class CStmtInlineAsm(CStmt):
 
 
 	def __str__(self):
-		sstr = str_nl_indent(self.nl)
-		sstr += "__asm__ volatile ("
+		sstr = "__asm__ volatile ("
 		sstr += '"%s" ' % self.text.replace('\n', '\\n\\\n')
 
 		sstr += ":"
@@ -1473,6 +1448,7 @@ class CStmtInlineAsm(CStmt):
 class CRawText(CStmt):
 	def __init__(self, text):
 		super().__init__()
+		self.nl = 0  # сырой текст печатается как есть, без отступа
 		self.text = text
 		pass
 
@@ -1492,8 +1468,7 @@ class CMacroDef():
 		self.mark = None
 
 	def __str__(self):
-		sstr = str_nl_indent(self.nl)
-		sstr += "#define %s" % (self.id)
+		sstr = "#define %s" % (self.id)
 		if self.text:
 			sstr += ' ' + self.text
 		return sstr
@@ -1510,9 +1485,8 @@ class CMacroDefValue():
 		self.mark = None
 
 	def __str__(self):
-		sstr = str_nl_indent(self.nl)
 		set_nl_symbol(" \\\n")
-		sstr += "#define %s %s" % (self.id, str_cvalue(self.value, ext_precedence=valuePrecedenceMax))
+		sstr = "#define %s %s" % (self.id, str_cvalue(self.value, ext_precedence=valuePrecedenceMax))
 		set_nl_symbol("\n")
 		return sstr
 
@@ -1526,8 +1500,7 @@ class CMacroUndef():
 		self.mark = None
 
 	def __str__(self):
-		sstr = str_nl_indent(self.nl)
-		sstr += "#undef %s" % (self.text)
+		sstr = "#undef %s" % (self.text)
 		return sstr
 
 
@@ -1542,20 +1515,22 @@ class CInclude():
 		self.mark = None
 
 	def __str__(self):
-		#sstr = str_nl_indent(self.nl)
 		if self.is_system:
-			return "\n#include <%s>" % self.text
-		return "\n#include \"%s\"" % self.text
+			return "#include <%s>" % self.text
+		return "#include \"%s\"" % self.text
 
 
 def str_cdef(x):
-	prefix = '/*%s*/' % x.mark if x.mark else ''
-	return prefix + str(x)
+	sstr = str_nl_indent(x.nl)
+	if x.mark != None:
+		sstr += '/*%s*/' % x.mark
+	return sstr + str(x)
 
 
 # pairs = ("macro text", [<defs>])
 class CConditionalRegion():
 	def __init__(self, pairs, _else=None):
+		self.nl = 1
 		self.pairs = pairs
 		self._else = _else
 		self.mark = None
@@ -1567,7 +1542,8 @@ class CConditionalRegion():
 #			if directive == '#if':
 #				ss = pair[0].split('()')
 #				print(ss)
-			sstr += "\n%s %s" % (directive, pair[0])
+			# ведущий перевод строки печатает обертка, как и у всех узлов
+			sstr += "%s%s %s" % ('' if sstr == '' else '\n', directive, pair[0])
 #			if len(pair[1]) > 5:
 #				sstr += "\n"
 			for xd in pair[1]:

{cshape-0.2.1 → cshape-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cshape"
-version = "0.2.1"
+version = "0.2.3"
 description = "A dependency-free C AST + printer: build a tree in Python, get C11 source back"
 readme = "README.md"
 license = "MIT"

cshape-0.2.3/tests/test_smoke.py

@@ -0,0 +1,75 @@
+import unittest
+
+from cshape import (
+	CField, CStmtBlock, CStmtDefFunc, CStmtDefVar, CStmtReturn, CTypeArray,
+	CTypeFunction, CTypeIdentifier, CTypeStruct, CValueAdd, CValueArray,
+	CValueIdentifier, CValueInteger, render,
+)
+
+
+class SmokeTest(unittest.TestCase):
+	def test_render_function(self):
+		func = CStmtDefFunc(
+			id='add',
+			type=CTypeFunction(
+				params=[CField(id='a', type=CTypeIdentifier('int')),
+				        CField(id='b', type=CTypeIdentifier('int'))],
+				to=CTypeIdentifier('int'),
+			),
+			block=CStmtBlock([
+				CStmtReturn(CValueAdd(CValueIdentifier('a'), CValueIdentifier('b'))),
+			]),
+		)
+
+		self.assertEqual(
+			render(func).strip(),
+			'int add(int a, int b) {\n\treturn a + b;\n}',
+		)
+
+	def test_render_is_reentrant(self):
+		# render() must not leak indent/style state between independent calls
+		named = CTypeIdentifier('int')
+		render(named, style='modern')
+		self.assertEqual(render(named, style='legacy'), 'int')
+
+	def test_mark_shows_up_as_comment(self):
+		v = CValueIdentifier('x')
+		v.mark = 'debug-note'
+		self.assertIn('/*debug-note*/', render(v))
+
+	def test_value_constructor_accepts_nl_for_array_layout(self):
+		array_def = CStmtDefVar(
+			id='numbers',
+			type=CTypeArray(CTypeIdentifier('int')),
+			initializer=CValueArray([
+				CValueInteger(1, nl=1),
+				CValueInteger(2),
+			]),
+		)
+
+		self.assertEqual(
+			render(array_def).strip(),
+			'int numbers[] = {\n\t1, 2\n};',
+		)
+
+	def test_struct_attributes_follow_the_closing_brace(self):
+		# a struct attribute is only read after the body: before the
+		# declaration the compiler ignores it
+		packed = CStmtDefVar(
+			id='',
+			type=CTypeStruct(
+				fields=[CField(id='tag', type=CTypeIdentifier('uint8_t')),
+				        CField(id='len', type=CTypeIdentifier('uint32_t'))],
+				tag='struct header',
+				attributes={'packed': {}},
+			),
+		)
+
+		self.assertEqual(
+			render(packed).strip(),
+			'struct header {uint8_t tag; uint32_t len;} __attribute__((packed));',
+		)
+
+
+if __name__ == '__main__':
+	unittest.main()

cshape-0.2.1/tests/test_smoke.py

@@ -1,41 +0,0 @@
-import unittest
-
-from cshape import (
-	CField, CStmtBlock, CStmtDefFunc, CStmtReturn, CTypeFunction, CTypeIdentifier,
-	CValueAdd, CValueIdentifier, render,
-)
-
-
-class SmokeTest(unittest.TestCase):
-	def test_render_function(self):
-		func = CStmtDefFunc(
-			id='add',
-			type=CTypeFunction(
-				params=[CField(id='a', type=CTypeIdentifier('int')),
-				        CField(id='b', type=CTypeIdentifier('int'))],
-				to=CTypeIdentifier('int'),
-			),
-			block=CStmtBlock([
-				CStmtReturn(CValueAdd(CValueIdentifier('a'), CValueIdentifier('b'))),
-			]),
-		)
-
-		self.assertEqual(
-			render(func).strip(),
-			'int add(int a, int b) {\n\treturn a + b;\n}',
-		)
-
-	def test_render_is_reentrant(self):
-		# render() must not leak indent/style state between independent calls
-		named = CTypeIdentifier('int')
-		render(named, style='modern')
-		self.assertEqual(render(named, style='legacy'), 'int')
-
-	def test_mark_shows_up_as_comment(self):
-		v = CValueIdentifier('x')
-		v.mark = 'debug-note'
-		self.assertIn('/*debug-note*/', render(v))
-
-
-if __name__ == '__main__':
-	unittest.main()